Merge pull request 'loaded plants against user rights in production quantity page' (#436) from ranjith-dev into master

Reviewed-on: #436

app/Console/Commands/SendInvoiceTransitReport.php

@@ -4,7 +4,6 @@ namespace App\Console\Commands;
 
 use App\Mail\InvoiceTransitMail;
 use App\Models\AlertMailRule;
-use App\Models\InvoiceInTransit;
 use App\Models\InvoiceMaster;
 use App\Models\Plant;
 use Illuminate\Console\Command;
@@ -53,13 +52,6 @@ class SendInvoiceTransitReport extends Command
             return;
         }
 
-        $todayRecordExists = InvoiceInTransit::whereDate('created_at', now()->toDateString())->first();
-
-        if (!$todayRecordExists) {
-            $this->info('No records created today. Mail not sent.');
-            return;
-        }
-
         if (strtolower($scheduleType) == 'daily') {
             $results = DB::table('invoice_in_transits as it')
                 ->join('invoice_masters as im', function ($join) {

app/Filament/Exports/ClassCharacteristicExporter.php

@@ -24,8 +24,6 @@ class ClassCharacteristicExporter extends Exporter
                 }),
             ExportColumn::make('plant.code')
                 ->label('PLANT CODE'),
-            ExportColumn::make('machine.work_center')
-                ->label('WORK CENTER'),
             ExportColumn::make('item.code')
                 ->label('ITEM CODE'),
             ExportColumn::make('aufnr')
@@ -43,7 +41,7 @@ class ClassCharacteristicExporter extends Exporter
             ExportColumn::make('zz1_cn_bill_ord')
                 ->label('ZZ1 CN BILL ORD'),
             ExportColumn::make('zmm_amps')
-                ->label('ZMM AMPS'),
+                ->label('ZMM AMPSTEXT'),
             ExportColumn::make('zmm_brand')
                 ->label('ZMM BRAND'),
             ExportColumn::make('zmm_degreeofprotection')
@@ -83,7 +81,7 @@ class ClassCharacteristicExporter extends Exporter
             ExportColumn::make('zmm_maxambtemp')
                 ->label('ZMM MAXAMBTEMP'),
             ExportColumn::make('zmm_mincoolingflow')
-                ->label('ZMM MINCOOLINGFLOW'),
+                ->label('ZMM MINCOOLING FLOW'),
             ExportColumn::make('zmm_motorseries')
                 ->label('ZMM MOTORSERIES'),
             ExportColumn::make('zmm_motor_model')
@@ -206,12 +204,6 @@ class ClassCharacteristicExporter extends Exporter
                 ->label('ZMM YEAR'),
             ExportColumn::make('zmm_laser_name')
                 ->label('ZMM LASER NAME'),
-            ExportColumn::make('zmm_logo_cp')
-                ->label('ZMM LOGO CP'),
-            ExportColumn::make('zmm_logo_ce')
-                ->label('ZMM LOGO CE'),
-            ExportColumn::make('zmm_logo_nsf')
-                ->label('ZMM LOGO NSF'),
             ExportColumn::make('zmm_beenote')
                 ->label('ZMM BEENOTE'),
             ExportColumn::make('zmm_beenumber')
@@ -222,6 +214,12 @@ class ClassCharacteristicExporter extends Exporter
                 ->label('ZMM CODECLASS'),
             ExportColumn::make('zmm_colour')
                 ->label('ZMM COLOUR'),
+            ExportColumn::make('zmm_logo_cp')
+                ->label('ZMM LOGO CP'),
+            ExportColumn::make('zmm_logo_ce')
+                ->label('ZMM LOGO CE'),
+            ExportColumn::make('zmm_logo_nsf')
+                ->label('ZMM LOGO NSF'),
             ExportColumn::make('zmm_grade')
                 ->label('ZMM GRADE'),
             ExportColumn::make('zmm_grwt_pset')
@@ -282,52 +280,20 @@ class ClassCharacteristicExporter extends Exporter
                 ->label('MARKED STATUS'),
             ExportColumn::make('marked_datetime')
                 ->label('MARKED DATETIME'),
-            ExportColumn::make('marked_physical_count')
-                ->label('MARKED PHYSICAL COUNT'),
-            ExportColumn::make('marked_expected_time')
-                ->label('MARKED EXPECTED TIME'),
             ExportColumn::make('marked_by')
                 ->label('MARKED BY'),
             ExportColumn::make('man_marked_status')
-                ->label('MANUAL MARKED PHYSICAL COUNT'),
+                ->label('MANUAL MARKED STATUS'),
             ExportColumn::make('man_marked_datetime')
                 ->label('MANUAL MARKED DATETIME'),
             ExportColumn::make('man_marked_by')
                 ->label('MANUAL MARKED BY'),
             ExportColumn::make('motor_marked_status')
                 ->label('MOTOR MARKED STATUS'),
-            ExportColumn::make('motor_marked_physical_count')
-                ->label('MOTOR MARKED PHYSICAL COUNT'),
-            ExportColumn::make('motor_expected_time')
-                ->label('MOTOR EXPECTED TIME'),
-            ExportColumn::make('motor_marked_by')
-                ->label('MOTOR MARKED BY'),
             ExportColumn::make('pump_marked_status')
                 ->label('PUMP MARKED STATUS'),
-            ExportColumn::make('pump_marked_physical_count')
-                ->label('PUMP MARKED PHYSICAL COUNT'),
-            ExportColumn::make('pump_expected_time')
-                ->label('PUMP EXPECTED TIME'),
-            ExportColumn::make('pump_marked_by')
-                ->label('PUMP MARKED BY'),
-            ExportColumn::make('name_plate_marked_status')
-                ->label('NAME PLATE MARKED STATUS'),
-            ExportColumn::make('name_plate_expected_time')
-                ->label('NAME PLATE EXPECTED TIME'),
-            ExportColumn::make('name_plate_marked_by')
-                ->label('NAME PLATE MARKED BY'),
             ExportColumn::make('motor_pump_pumpset_status')
                 ->label('MOTOR PUMP PUMPSET STATUS'),
-            ExportColumn::make('winded_serial_number')
-                ->label('WINDED SERIAL NUMBER'),
-            ExportColumn::make('motor_machine_name')
-                ->label('MOTOR MACHINE NAME'),
-            ExportColumn::make('pump_machine_name')
-                ->label('PUMP MACHINE NAME'),
-            ExportColumn::make('name_plate_machine_name')
-                ->label('NAME PLATE MACHINE NAME'),
-            ExportColumn::make('pumpset_machine_name')
-                ->label('PUMPSET MACHINE NAME'),
             ExportColumn::make('part_validation_1')
                 ->label('PART VALIDATION 1'),
             ExportColumn::make('part_validation_2')
@@ -336,8 +302,10 @@ class ClassCharacteristicExporter extends Exporter
                 ->label('SAMLIGHT LOGGED NAME'),
             ExportColumn::make('pending_released_status')
                 ->label('PENDING RELEASED STATUS'),
-            ExportColumn::make('has_work_flow_id')
-                ->label('HAS WORK FLOW ID'),
+            ExportColumn::make('motor_expected_time')
+                ->label('MOTOR EXPECTED TIME'),
+            ExportColumn::make('pump_expected_time')
+                ->label('PUMP EXPECTED TIME'),
             ExportColumn::make('created_at')
                 ->label('CREATED AT'),
             ExportColumn::make('created_by')

app/Filament/Exports/ProcessOrderExporter.php

@@ -36,8 +36,6 @@ class ProcessOrderExporter extends Exporter
                 ->label('COIL NUMBER'),
             ExportColumn::make('order_quantity')
                 ->label('ORDER QUANTITY'),
-            ExportColumn::make('updated_order_quantity')
-                ->label('UPDATED ORDER QUANTITY'),
             ExportColumn::make('received_quantity')
                 ->label('RECEIVED QUANTITY'),
             ExportColumn::make('sfg_number')

app/Filament/Exports/StickerMasterExporter.php

@@ -28,10 +28,6 @@ class StickerMasterExporter extends Exporter
                 ->label('PLANT CODE'),
             ExportColumn::make('item.code')
                 ->label('ITEM CODE'),
-            ExportColumn::make('item.description')
-                ->label('ITEM DESCRIPTION'),
-            ExportColumn::make('item.uom')
-                ->label('UNIT OF MEASURE'),
             ExportColumn::make('serial_number_motor')
                 ->label('SERIAL NUMBER MOTOR'),
             ExportColumn::make('serial_number_pump')

app/Filament/Exports/StockDataMasterExporter.php

@@ -1,143 +0,0 @@
-<?php
-
-namespace App\Filament\Exports;
-
-use App\Models\StockDataMaster;
-use Filament\Actions\Exports\ExportColumn;
-use Filament\Actions\Exports\Exporter;
-use Filament\Actions\Exports\Models\Export;
-
-class StockDataMasterExporter extends Exporter
-{
-    protected static ?string $model = StockDataMaster::class;
-
-    public static function getColumns(): array
-    {
-        static $rowNumber = 0;
-
-        return [
-            ExportColumn::make('no')
-                ->label('NO')
-                ->state(function ($record) use (&$rowNumber) {
-                    // Increment and return the row number
-                    return ++$rowNumber;
-                }),
-            ExportColumn::make('plant.code')
-                ->label('PLANT CODE'),
-            ExportColumn::make('stickerMaster.item.code')
-                ->label('ITEM CODE'),
-            ExportColumn::make('type')
-                ->label('TYPE')
-                ->formatStateUsing(fn ($state) => match ($state) {
-                    '0' => 'FG',
-                    '1' => 'NON-FG',
-                    default => '-',
-                }),
-            ExportColumn::make('location')
-                ->label('LOCATION'),
-            ExportColumn::make('bin')
-                ->label('BIN'),
-            ExportColumn::make('serial_number')
-                ->label('SERIAL NUMBER'),
-            ExportColumn::make('batch')
-                ->label('BATCH'),
-            ExportColumn::make('quantity')
-                ->label('QUANTITY'),
-            ExportColumn::make('doc_no')
-                ->label('DOCUMENT NUMBER'),
-            ExportColumn::make('motor_scanned_status')
-                ->label('MOTOR SCANNED STATUS'),
-            ExportColumn::make('pump_scanned_status')
-                ->label('PUMP SCANNED STATUS'),
-            ExportColumn::make('capacitor_scanned_status')
-                ->label('CAPACITOR SCANNED STATUS'),
-            ExportColumn::make('scanned_status_set')
-                ->label('SCANNED STATUS SET'),
-            ExportColumn::make('panel_box_item_code')
-                ->label('PANEL BOX ITEM CODE'),
-            ExportColumn::make('panel_box_supplier')
-                ->label('PANEL BOX SUPPLIER'),
-            ExportColumn::make('panel_box_sno')
-                ->label('PANEL BOX SNO'),
-            ExportColumn::make('scanned_status')
-                ->label('SCANNED STATUS'),
-            ExportColumn::make('scanned_quantity')
-                ->label('SCANNED QUANTITY'),
-            ExportColumn::make('system_stock')
-                ->label('SYSTEM STOCK')
-                ->state(fn ($record) => $record->quantity),
-            ExportColumn::make('scanned_stock')
-                ->label('SCANNED STOCK')
-                ->state(fn ($record) => $record->scanned_quantity),
-            ExportColumn::make('duplicate_stock')
-                ->label('DUPLICATE STOCK')
-                ->state(function ($record) {
-                    return \App\Models\DuplicateStock::where('stock_data_master_id', $record->id)->count();
-                }),
-            ExportColumn::make('not_in_stock')
-                ->label('NOT IN STOCK')
-                ->state(function ($record) {
-                    return \App\Models\NotInStock::where('serial_number', $record->serial_number)
-                        ->where('plant_id', $record->plant_id)
-                        ->count();
-                }),
-            ExportColumn::make('physical_stock')
-                ->label('PHYSICAL STOCK')
-                ->state(function ($record) {
-
-                    $duplicate = \App\Models\DuplicateStock::where('stock_data_master_id', $record->id)->count();
-
-                    $notInStock = \App\Models\NotInStock::where('serial_number', $record->serial_number)
-                        ->where('plant_id', $record->plant_id)
-                        ->count();
-
-                    $scanned = $record->scanned_quantity ?? 0;
-
-                    return $scanned + $duplicate + $notInStock;
-                }),
-
-            ExportColumn::make('stock_difference')
-                ->label('STOCK DIFFERENCE COUNT')
-                ->state(function ($record) {
-
-                    $duplicate = \App\Models\DuplicateStock::where('stock_data_master_id', $record->id)->count();
-
-                    $notInStock = \App\Models\NotInStock::where('serial_number', $record->serial_number)
-                        ->where('plant_id', $record->plant_id)
-                        ->count();
-
-                    $scanned = (int) $record->scanned_quantity;
-
-                    $physicalStock = $scanned + $duplicate + $notInStock;
-
-                    $systemStock = (int) $record->quantity;
-
-                    $difference = $physicalStock - $systemStock;
-
-                    return max($difference, 0);
-                }),
-            ExportColumn::make('created_at')
-                ->label('CREATED AT'),
-            ExportColumn::make('updated_at')
-                ->label('UPDATED AT'),
-            ExportColumn::make('created_by')
-                ->label('CREATED BY'),
-            ExportColumn::make('updated_by')
-                ->label('UPDATED BY'),
-            ExportColumn::make('deleted_at')
-                ->label('DELETED AT')
-                ->enabledByDefault(false),
-        ];
-    }
-
-    public static function getCompletedNotificationBody(Export $export): string
-    {
-        $body = 'Your stock data master export has completed and '.number_format($export->successful_rows).' '.str('row')->plural($export->successful_rows).' exported.';
-
-        if ($failedRowsCount = $export->getFailedRowsCount()) {
-            $body .= ' '.number_format($failedRowsCount).' '.str('row')->plural($failedRowsCount).' failed to export.';
-        }
-
-        return $body;
-    }
-}

app/Filament/Imports/CharacteristicApproverMasterImporter.php

@@ -1,117 +0,0 @@
-<?php
-
-namespace App\Filament\Imports;
-
-use App\Models\CharacteristicApproverMaster;
-use Filament\Actions\Imports\ImportColumn;
-use Filament\Actions\Imports\Importer;
-use Filament\Actions\Imports\Models\Import;
-
-class CharacteristicApproverMasterImporter extends Importer
-{
-    protected static ?string $model = CharacteristicApproverMaster::class;
-
-    public static function getColumns(): array
-    {
-        return [
-            ImportColumn::make('plant')
-                ->requiredMapping()
-                ->exampleHeader('Plant Code')
-                ->examples(['1000','1000'])
-                ->label('Plant Code')
-                ->relationship(resolveUsing: 'code')
-                ->rules(['required']),
-            ImportColumn::make('machine')
-                ->requiredMapping()
-                ->exampleHeader('Work Center')
-                ->examples(['RMGLAS02','RMGLAS02'])
-                ->label('Work Center')
-                ->relationship()
-                ->rules(['required']),
-            ImportColumn::make('machine_name')
-                ->requiredMapping()
-                ->exampleHeader('Machine Name')
-                ->examples(['15002635','17002635'])
-                ->label('Machine Name'),
-            ImportColumn::make('name1')
-                ->requiredMapping()
-                ->exampleHeader('Approver Name 1')
-                ->examples(['Suresh.D','Suresh.D'])
-                ->label('Approver Name 1'),
-            ImportColumn::make('mail1')
-                ->requiredMapping()
-                ->exampleHeader('Approver Mail 1')
-                ->examples(['suresh@cripumps.com','suresh@cripumps.com'])
-                ->label('Approver Mail 1'),
-            ImportColumn::make('name2')
-                ->requiredMapping()
-                ->exampleHeader('Approver Name 2')
-                ->examples(['Ramesh.G','Ramesh.G'])
-                ->label('Approver Name 2'),
-            ImportColumn::make('mail2')
-                ->requiredMapping()
-                ->exampleHeader('Approver Mail 2')
-                ->examples(['ramesh@cripumps.com','ramesh@cripumps.com'])
-                ->label('Approver Mail 2'),
-            ImportColumn::make('name3')
-                ->requiredMapping()
-                ->exampleHeader('Approver Name 3')
-                ->examples(['Ganesh.K','Ganesh.K'])
-                ->label('Approver Name 3'),
-            ImportColumn::make('mail3')
-                ->requiredMapping()
-                ->exampleHeader('Approver Mail 3')
-                ->examples(['ganesh@cripumps.com','ganesh@cripumps.com'])
-                ->label('Approver Mail 3'),
-            ImportColumn::make('duration1')
-                ->numeric()
-                ->requiredMapping()
-                ->exampleHeader('Duration 1')
-                ->examples(['0.05','0.30'])
-                ->label('Duration 1'),
-            ImportColumn::make('duration2')
-                ->numeric()
-                ->requiredMapping()
-                ->exampleHeader('Duration 2')
-                ->examples(['0.05','0.30'])
-                ->label('Duration 2'),
-            ImportColumn::make('duration3')
-                ->numeric()
-                ->requiredMapping()
-                ->exampleHeader('Duration 3')
-                ->examples(['0.05','0.30'])
-                ->label('Duration 3'),
-            ImportColumn::make('characteristic_field')
-                ->requiredMapping()
-                ->exampleHeader('Characteristic Field')
-                ->examples(['MV SERIES','PV SERIES'])
-                ->label('Characteristic Field'),
-            ImportColumn::make('approver_type')
-                ->requiredMapping()
-                ->exampleHeader('Approver Type')
-                ->examples(['Characteristic','Quality'])
-                ->label('Approver Type'),
-        ];
-    }
-
-    public function resolveRecord(): ?CharacteristicApproverMaster
-    {
-        // return CharacteristicApproverMaster::firstOrNew([
-        //     // Update existing records, matching them by `$this->data['column_name']`
-        //     'email' => $this->data['email'],
-        // ]);
-
-        return new CharacteristicApproverMaster();
-    }
-
-    public static function getCompletedNotificationBody(Import $import): string
-    {
-        $body = 'Your characteristic approver master import has completed and ' . number_format($import->successful_rows) . ' ' . str('row')->plural($import->successful_rows) . ' imported.';
-
-        if ($failedRowsCount = $import->getFailedRowsCount()) {
-            $body .= ' ' . number_format($failedRowsCount) . ' ' . str('row')->plural($failedRowsCount) . ' failed to import.';
-        }
-
-        return $body;
-    }
-}

app/Filament/Imports/ClassCharacteristicImporter.php

@@ -16,524 +16,517 @@ class ClassCharacteristicImporter extends Importer
         return [
             ImportColumn::make('plant')
                 ->requiredMapping()
-                ->exampleHeader('PLANT CODE')
+                ->exampleHeader('Plant Code')
                 ->example('1000')
-                ->label('PLANT CODE')
+                ->label('Plant Code')
                 ->relationship(resolveUsing: 'code')
                 ->rules(['required']),
-            ImportColumn::make('machine')
-                ->requiredMapping()
-                ->exampleHeader('WORK CENTER')
-                ->example('RMGLAS01')
-                ->label('WORK CENTER')
-                ->relationship(resolveUsing: 'work_center')
-                ->rules(['required']),
             ImportColumn::make('item')
                 ->requiredMapping()
-                ->exampleHeader('ITEM CODE')
+                ->exampleHeader('Item Code')
                 ->example('630214')
-                ->label('ITEM CODE')
+                ->label('Item Code')
                 ->relationship(resolveUsing: 'code')
                 ->rules(['required']),
             ImportColumn::make('aufnr')
-                ->label('AUFNR')
-                ->exampleHeader('AUFNR')
-                ->example('1234567'),
+                ->label('Aufnr')
+                ->exampleHeader('Aufnr')
+                ->example(''),
             ImportColumn::make('class')
-                ->label('CLASS')
-                ->exampleHeader('CLASS')
-                ->example('ZLASER'),
+                ->label('Class')
+                ->exampleHeader('Class')
+                ->example(''),
             ImportColumn::make('arbid')
-                ->label('ARBID')
-                ->exampleHeader('ARBID')
-                ->example('LASER'),
+                ->label('Arbid')
+                ->exampleHeader('Arbid')
+                ->example(''),
             ImportColumn::make('gamng')
-                ->label('GAMNG')
-                ->exampleHeader('GAMNG')
-                ->example('1.000'),
+                ->label('Gamng')
+                ->exampleHeader('Gamng')
+                ->example(''),
             ImportColumn::make('lmnga')
-                ->label('LMNGA')
-                ->exampleHeader('LMNGA')
-                ->example('1'),
+                ->label('Lmnga')
+                ->exampleHeader('Lmnga')
+                ->example(''),
             ImportColumn::make('gernr')
-                ->label('GERNR')
-                ->exampleHeader('GERNR')
-                ->example('12345678901234'),
+                ->label('Gernr')
+                ->exampleHeader('Gernr')
+                ->example(''),
             ImportColumn::make('zz1_cn_bill_ord')
-                ->label('ZZ1 CN BILL ORD')
-                ->exampleHeader('ZZ1 CN BILL ORD')
-                ->example('INDIA'),
+                ->label('zz1 ccn bill ord')
+                ->exampleHeader('zz1 ccn bill ord')
+                ->example(''),
             ImportColumn::make('zmm_amps')
-                ->label('ZMM AMPS')
-                ->exampleHeader('ZMM AMPS')
-                ->example('11A'),
+                ->label('zmm amps')
+                ->exampleHeader('zmm amps')
+                ->example(''),
             ImportColumn::make('zmm_brand')
-                ->label('ZMM BRAND')
-                ->exampleHeader('ZMM BRAND')
-                ->example('CRI'),
+                ->label('zmm brand')
+                ->exampleHeader('zmm brand')
+                ->example(''),
             ImportColumn::make('zmm_degreeofprotection')
-                ->label('ZMM DEGREEOFPROTECTION')
-                ->exampleHeader('ZMM DEGREEOFPROTECTION')
-                ->example('IP55'),
+                ->label('zmm degreeofprotection')
+                ->exampleHeader('zmm degreeofprotection')
+                ->example(''),
             ImportColumn::make('zmm_delivery')
-                ->label('ZMM DELIVERY')
-                ->exampleHeader('ZMM DELIVERY')
-                ->example('65MM'),
+                ->label('zmm delivery')
+                ->exampleHeader('zmm delivery')
+                ->example(''),
             ImportColumn::make('zmm_dir_rot')
-                ->label('ZMM DIR ROT')
-                ->exampleHeader('ZMM DIR ROT')
+                ->label('zmm dir rot')
+                ->exampleHeader('zmm dir rot')
                 ->example(''),
             ImportColumn::make('zmm_discharge')
-                ->label('ZMM DISCHARGE')
-                ->exampleHeader('ZMM DISCHARGE')
-                ->example('17m³/h'),
+                ->label('zmm discharge')
+                ->exampleHeader('zmm discharge')
+                ->example(''),
             ImportColumn::make('zmm_discharge_max')
-                ->label('ZMM DISCHARGE MAX')
-                ->exampleHeader('ZMM DISCHARGE MAX')
+                ->label('zmm discharge max')
+                ->exampleHeader('zmm discharge max')
                 ->example(''),
             ImportColumn::make('zmm_discharge_min')
-                ->label('ZMM DISCHARGE MIN')
-                ->exampleHeader('ZMM DISCHARGE MIN')
+                ->label('zmm discharge min')
+                ->exampleHeader('zmm discharge min')
                 ->example(''),
             ImportColumn::make('zmm_duty')
-                ->label('ZMM DUTY')
-                ->exampleHeader('ZMM DUTY')
-                ->example('DUTY S1'),
+                ->label('zmm duty')
+                ->exampleHeader('zmm duty')
+                ->example(''),
             ImportColumn::make('zmm_eff_motor')
-                ->label('ZMM EFF MOTOR')
-                ->exampleHeader('ZMM EFF MOTOR')
+                ->label('zmm eff motor')
+                ->exampleHeader('zmm eff motor')
                 ->example(''),
             ImportColumn::make('zmm_eff_pump')
-                ->label('ZMM EFF PUMP')
-                ->exampleHeader('ZMM EFF PUMP')
+                ->label('zmm eff pump')
+                ->exampleHeader('zmm eff pump')
                 ->example(''),
             ImportColumn::make('zmm_frequency')
-                ->label('ZMM FREQUENCY')
-                ->exampleHeader('ZMM FREQUENCY')
-                ->example('50Hz'),
+                ->label('zmm frequency')
+                ->exampleHeader('zmm frequency')
+                ->example(''),
             ImportColumn::make('zmm_head')
-                ->label('ZMM HEAD')
-                ->exampleHeader('ZMM HEAD')
-                ->example('77M'),
+                ->label('zmm head')
+                ->exampleHeader('zmm head')
+                ->example(''),
             ImportColumn::make('zmm_heading')
-                ->label('ZMM HEADING')
-                ->exampleHeader('ZMM HEADING')
-                ->example('PRESSURE BOOSTER SYSTEM'),
+                ->label('zmm heading')
+                ->exampleHeader('zmm heading')
+                ->example(''),
             ImportColumn::make('zmm_head_max')
-                ->label('ZMM HEAD MAX')
-                ->exampleHeader('ZMM HEAD MAX')
-                ->example('96m'),
+                ->label('zmm head max')
+                ->exampleHeader('zmm head max')
+                ->example(''),
             ImportColumn::make('zmm_head_minimum')
-                ->label('ZMM HEAD MINIMUM')
-                ->exampleHeader('ZMM HEAD MINIMUM')
+                ->label('zmm head minimum')
+                ->exampleHeader('zmm head minimum')
                 ->example(''),
             ImportColumn::make('zmm_idx_eff_mtr')
-                ->label('ZMM IDX EFF MTR')
-                ->exampleHeader('ZMM IDX EFF MTR')
+                ->label('zmm idx eff mtr')
+                ->exampleHeader('zmm idx eff mtr')
                 ->example(''),
             ImportColumn::make('zmm_idx_eff_pump')
-                ->label('ZMM IDX EFF PUMP')
-                ->exampleHeader('ZMM IDX EFF PUMP')
+                ->label('zmm idx eff pump')
+                ->exampleHeader('zmm idx eff pump')
                 ->example(''),
             ImportColumn::make('zmm_kvacode')
-                ->label('ZMM KVACODE')
-                ->exampleHeader('ZMM KVACODE')
+                ->label('zmm kvacode')
+                ->exampleHeader('zmm kvacode')
                 ->example(''),
             ImportColumn::make('zmm_maxambtemp')
-                ->label('ZMM MAXAMBTEMP')
-                ->exampleHeader('ZMM MAXAMBTEMP')
+                ->label('zmm maxambtemp')
+                ->exampleHeader('zmm maxambtemp')
                 ->example(''),
             ImportColumn::make('zmm_mincoolingflow')
-                ->label('ZMM MINCOOLINGFLOW')
-                ->exampleHeader('ZMM MINCOOLINGFLOW')
+                ->label('zmm mincoolingflow')
+                ->exampleHeader('zmm mincoolingflow')
                 ->example(''),
             ImportColumn::make('zmm_motorseries')
-                ->label('ZMM MOTORSERIES')
-                ->exampleHeader('ZMM MOTORSERIES')
+                ->label('zmm motorseries')
+                ->exampleHeader('zmm motorseries')
                 ->example(''),
             ImportColumn::make('zmm_motor_model')
-                ->label('ZMM MOTOR MODEL')
-                ->exampleHeader('ZMM MOTOR MODEL')
+                ->label('zmm motor model')
+                ->exampleHeader('zmm motor model')
                 ->example(''),
             ImportColumn::make('zmm_outlet')
-                ->label('ZMM OUTLET')
-                ->exampleHeader('ZMM OUTLET')
-                ->example('IE2'),
+                ->label('zmm outlet')
+                ->exampleHeader('zmm outlet')
+                ->example(''),
             ImportColumn::make('zmm_phase')
-                ->label('ZMM PHASE')
-                ->exampleHeader('ZMM PHASE')
-                ->example('3Ph'),
+                ->label('zmm phase')
+                ->exampleHeader('zmm phase')
+                ->example(''),
             ImportColumn::make('zmm_pressure')
-                ->label('ZMM PRESSURE')
-                ->exampleHeader('ZMM PRESSURE')
-                ->example('16bar'),
+                ->label('zmm pressure')
+                ->exampleHeader('zmm pressure')
+                ->example(''),
             ImportColumn::make('zmm_pumpflowtype')
-                ->label('ZMM PUMPFLOWTYPE')
-                ->exampleHeader('ZMM PUMPFLOWTYPE')
+                ->label('zmm pumpflowtype')
+                ->exampleHeader('zmm pumpflowtype')
                 ->example(''),
             ImportColumn::make('zmm_pumpseries')
-                ->label('ZMM PUMPSERIES')
-                ->exampleHeader('ZMM PUMPSERIES')
+                ->label('zmm pumpseries')
+                ->exampleHeader('zmm pumpseries')
                 ->example(''),
             ImportColumn::make('zmm_pump_model')
-                ->label('ZMM PUMP MODEL')
-                ->exampleHeader('ZMM PUMP MODEL')
-                ->example('MVHS-15/07TR'),
+                ->label('zmm pump model')
+                ->exampleHeader('zmm pump model')
+                ->example(''),
             ImportColumn::make('zmm_ratedpower')
-                ->label('ZMM RATEDPOWER')
-                ->exampleHeader('ZMM RATEDPOWER')
-                ->example('5.5kW/7.5HP'),
+                ->label('zmm ratedpower')
+                ->exampleHeader('zmm ratedpower')
+                ->example(''),
             ImportColumn::make('zmm_region')
-                ->label('ZMM REGION')
-                ->exampleHeader('ZMM REGION')
+                ->label('zmm region')
+                ->exampleHeader('zmm region')
                 ->example(''),
             ImportColumn::make('zmm_servicefactor')
-                ->label('ZMM SERVICEFACTOR')
-                ->exampleHeader('ZMM SERVICEFACTOR')
+                ->label('zmm servicefactor')
+                ->exampleHeader('zmm servicefactor')
                 ->example(''),
             ImportColumn::make('zmm_servicefactormaximumamps')
-                ->label('ZMM SERVICEFACTORMAXIMUMAMPS')
-                ->exampleHeader('ZMM SERVICEFACTORMAXIMUMAMPS')
+                ->label('zmm servicefactormaximumamps')
+                ->exampleHeader('zmm servicefactormaximumamps')
                 ->example(''),
             ImportColumn::make('zmm_speed')
-                ->label('ZMM SPEED')
-                ->exampleHeader('ZMM SPEED')
-                ->example('2900rpm'),
+                ->label('zmm speed')
+                ->exampleHeader('zmm speed')
+                ->example(''),
             ImportColumn::make('zmm_suction')
-                ->label('ZMM SUCTION')
-                ->exampleHeader('ZMM SUCTION')
-                ->example('65mm'),
+                ->label('zmm suction')
+                ->exampleHeader('zmm suction')
+                ->example(''),
             ImportColumn::make('zmm_suctionxdelivery')
-                ->label('ZMM SUCTIONXDELIVERY')
-                ->exampleHeader('ZMM SUCTIONXDELIVERY')
-                ->example('50 x 50mm'),
+                ->label('zmm suctionxdelivery')
+                ->exampleHeader('zmm suctionxdelivery')
+                ->example(''),
             ImportColumn::make('zmm_supplysource')
-                ->label('ZMM SUPPLYSOURCE')
-                ->exampleHeader('ZMM SUPPLYSOURCE')
-                ->example('AC SUPPLY'),
+                ->label('zmm supplysource')
+                ->exampleHeader('zmm supplysource')
+                ->example(''),
             ImportColumn::make('zmm_temperature')
-                ->label('ZMM TEMPERATURE')
-                ->exampleHeader('ZMM TEMPERATURE')
-                ->example('90°C'),
+                ->label('zmm temperature')
+                ->exampleHeader('zmm temperature')
+                ->example(''),
             ImportColumn::make('zmm_thrustload')
-                ->label('ZMM THRUSTLOAD')
-                ->exampleHeader('ZMM THRUSTLOAD')
+                ->label('zmm thrustload')
+                ->exampleHeader('zmm thrustload')
                 ->example(''),
             ImportColumn::make('zmm_volts')
-                ->label('ZMM VOLTS')
-                ->exampleHeader('ZMM VOLTS')
-                ->example('415V'),
+                ->label('zmm volts')
+                ->exampleHeader('zmm volts')
+                ->example(''),
             ImportColumn::make('zmm_wire')
-                ->label('ZMM WIRE')
-                ->exampleHeader('ZMM WIRE')
+                ->label('zmm wire')
+                ->exampleHeader('zmm wire')
                 ->example(''),
             ImportColumn::make('zmm_package')
-                ->label('ZMM PACKAGE')
-                ->exampleHeader('ZMM PACKAGE')
+                ->label('zmm package')
+                ->exampleHeader('zmm package')
                 ->example(''),
             ImportColumn::make('zmm_pvarrayrating')
-                ->label('ZMM PVARRAYRATING')
-                ->exampleHeader('ZMM PVARRAYRATING')
+                ->label('zmm pvarrayrating')
+                ->exampleHeader('zmm pvarrayrating')
                 ->example(''),
             ImportColumn::make('zmm_isi')
-                ->label('ZMM ISI')
-                ->exampleHeader('ZMM ISI')
-                ->example('Y'),
+                ->label('zmm isi')
+                ->exampleHeader('zmm isi')
+                ->example(''),
             ImportColumn::make('zmm_isimotor')
-                ->label('ZMM ISIMOTOR')
-                ->exampleHeader('ZMM ISIMOTOR')
-                ->example('IS:12615'),
+                ->label('zmm isimotor')
+                ->exampleHeader('zmm isimotor')
+                ->example(''),
             ImportColumn::make('zmm_isipump')
-                ->label('ZMM ISIPUMP')
-                ->exampleHeader('ZMM ISIPUMP')
+                ->label('zmm isipump')
+                ->exampleHeader('zmm isipump')
                 ->example(''),
             ImportColumn::make('zmm_isipumpset')
-                ->label('ZMM ISIPUMPSET')
-                ->exampleHeader('ZMM ISIPUMPSET')
-                ->example('IS:12615'),
+                ->label('zmm isipumpset')
+                ->exampleHeader('zmm isipumpset')
+                ->example(''),
             ImportColumn::make('zmm_pumpset_model')
-                ->label('ZMM PUMPSET MODEL')
-                ->exampleHeader('ZMM PUMPSET MODEL')
-                ->example('MVHS-15/07TR'),
+                ->label('zmm pumpset model')
+                ->exampleHeader('zmm pumpset model')
+                ->example(''),
             ImportColumn::make('zmm_stages')
-                ->label('ZMM STAGES')
-                ->exampleHeader('ZMM STAGES')
-                ->example('7'),
+                ->label('zmm stages')
+                ->exampleHeader('zmm stages')
+                ->example(''),
             ImportColumn::make('zmm_headrange')
-                ->label('ZMM HEADRANGE')
-                ->exampleHeader('ZMM HEADRANGE')
+                ->label('zmm headrange')
+                ->exampleHeader('zmm headrange')
                 ->example(''),
             ImportColumn::make('zmm_overall_efficiency')
-                ->label('ZMM OVERALL EFFICIENCY')
-                ->exampleHeader('ZMM OVERALL EFFICIENCY')
+                ->label('zmm overall efficiency')
+                ->exampleHeader('zmm overall efficiency')
                 ->example(''),
             ImportColumn::make('zmm_connection')
-                ->label('ZMM CONNECTION')
-                ->exampleHeader('ZMM CONNECTION')
-                ->example('STAR/DELTA'),
+                ->label('zmm connection')
+                ->exampleHeader('zmm connection')
+                ->example(''),
             ImportColumn::make('zmm_min_bore_size')
-                ->label('ZMM MIN BORE SIZE')
-                ->exampleHeader('ZMM MIN BORE SIZE')
+                ->label('zmm min bore size')
+                ->exampleHeader('zmm min bore size')
                 ->example(''),
             ImportColumn::make('zmm_isireference')
-                ->label('ZMM ISIREFERENCE')
-                ->exampleHeader('ZMM ISIREFERENCE')
+                ->label('zmm isireference')
+                ->exampleHeader('zmm isireference')
                 ->example(''),
             ImportColumn::make('zmm_category')
-                ->label('ZMM CATEGORY')
-                ->exampleHeader('ZMM CATEGORY')
-                ->example('B'),
+                ->label('zmm category')
+                ->exampleHeader('zmm category')
+                ->example(''),
             ImportColumn::make('zmm_submergence')
-                ->label('ZMM SUBMERGENCE')
-                ->exampleHeader('ZMM SUBMERGENCE')
+                ->label('zmm submergence')
+                ->exampleHeader('zmm submergence')
                 ->example(''),
             ImportColumn::make('zmm_capacitorstart')
-                ->label('ZMM CAPACITORSTART')
-                ->exampleHeader('ZMM CAPACITORSTART')
+                ->label('zmm capacitorstart')
+                ->exampleHeader('zmm capacitorstart')
                 ->example(''),
             ImportColumn::make('zmm_capacitorrun')
-                ->label('ZMM CAPACITORRUN')
-                ->exampleHeader('ZMM CAPACITORRUN')
+                ->label('zmm capacitorrun')
+                ->exampleHeader('zmm capacitorrun')
                 ->example(''),
             ImportColumn::make('zmm_inch')
-                ->label('ZMM INCH')
-                ->exampleHeader('ZMM INCH')
+                ->label('zmm inch')
+                ->exampleHeader('zmm inch')
                 ->example(''),
             ImportColumn::make('zmm_motor_type')
-                ->label('ZMM MOTOR TYPE')
-                ->exampleHeader('ZMM MOTOR TYPE')
-                ->example('TEFC'),
+                ->label('zmm motor type')
+                ->exampleHeader('zmm motor type')
+                ->example(''),
             ImportColumn::make('zmm_dismantle_direction')
-                ->label('ZMM DISMANTLE DIRECTION')
-                ->exampleHeader('ZMM DISMANTLE DIRECTION')
+                ->label('zmm dismantle direction')
+                ->exampleHeader('zmm dismantle direction')
                 ->example(''),
             ImportColumn::make('zmm_eff_ovrall')
-                ->label('ZMM EFF OVERALL')
-                ->exampleHeader('ZMM EFF OVERALL')
+                ->label('zmm eff ovrall')
+                ->exampleHeader('zmm eff ovrall')
                 ->example(''),
             ImportColumn::make('zmm_bodymoc')
-                ->label('ZMM BODYMOC')
-                ->exampleHeader('ZMM BODYMOC')
+                ->label('zmm bodymoc')
+                ->exampleHeader('zmm bodymoc')
                 ->example(''),
             ImportColumn::make('zmm_rotormoc')
-                ->label('ZMM ROTORMOC')
-                ->exampleHeader('ZMM ROTORMOC')
+                ->label('zmm rotormoc')
+                ->exampleHeader('zmm rotormoc')
                 ->example(''),
             ImportColumn::make('zmm_dlwl')
-                ->label('ZMM DLWL')
-                ->exampleHeader('ZMM DLWL')
+                ->label('zmm dlwl')
+                ->exampleHeader('zmm dlwl')
                 ->example(''),
             ImportColumn::make('zmm_inputpower')
-                ->label('ZMM INPUTPOWER')
-                ->exampleHeader('ZMM INPUTPOWER')
+                ->label('zmm inputpower')
+                ->exampleHeader('zmm inputpower')
                 ->example(''),
             ImportColumn::make('zmm_imp_od')
-                ->label('ZMM IMP OD')
-                ->exampleHeader('ZMM IMP OD')
+                ->label('zmm imp od')
+                ->exampleHeader('zmm imp od')
                 ->example(''),
             ImportColumn::make('zmm_ambtemp')
-                ->label('ZMM AMBTEMP')
-                ->exampleHeader('ZMM AMBTEMP')
+                ->label('zmm ambtemp')
+                ->exampleHeader('zmm ambtemp')
                 ->example(''),
             ImportColumn::make('zmm_de')
-                ->label('ZMM DE')
-                ->exampleHeader('ZMM DE')
+                ->label('zmm de')
+                ->exampleHeader('zmm de')
                 ->example(''),
             ImportColumn::make('zmm_dischargerange')
-                ->label('ZMM DISCHARGERANGE')
-                ->exampleHeader('ZMM DISCHARGERANGE')
+                ->label('zmm dischargerange')
+                ->exampleHeader('zmm dischargerange')
                 ->example(''),
             ImportColumn::make('zmm_efficiency_class')
-                ->label('ZMM EFFICIENCY CLASS')
-                ->exampleHeader('ZMM EFFICIENCY CLASS')
-                ->example('IE2'),
+                ->label('zmm efficiency class')
+                ->exampleHeader('zmm efficiency class')
+                ->example(''),
             ImportColumn::make('zmm_framesize')
-                ->label('ZMM FRAMESIZE')
-                ->exampleHeader('ZMM FRAMESIZE')
+                ->label('zmm framesize')
+                ->exampleHeader('zmm framesize')
                 ->example(''),
             ImportColumn::make('zmm_impellerdiameter')
-                ->label('ZMM IMPELLERDIAMETER')
-                ->exampleHeader('ZMM IMPELLERDIAMETER')
+                ->label('zmm impellerdiameter')
+                ->exampleHeader('zmm impellerdiameter')
                 ->example(''),
             ImportColumn::make('zmm_insulationclass')
-                ->label('ZMM INSULATIONCLASS')
-                ->exampleHeader('ZMM INSULATIONCLASS')
-                ->example('F'),
+                ->label('zmm insulationclass')
+                ->exampleHeader('zmm insulationclass')
+                ->example(''),
             ImportColumn::make('zmm_maxflow')
-                ->label('ZMM MAXFLOW')
-                ->exampleHeader('ZMM MAXFLOW')
+                ->label('zmm maxflow')
+                ->exampleHeader('zmm maxflow')
                 ->example(''),
             ImportColumn::make('zmm_minhead')
-                ->label('ZMM MINHEAD')
-                ->exampleHeader('ZMM MINHEAD')
+                ->label('zmm minhead')
+                ->exampleHeader('zmm minhead')
                 ->example(''),
             ImportColumn::make('zmm_mtrlofconst')
-                ->label('ZMM MTRLOFCONST')
-                ->exampleHeader('ZMM MTRLOFCONST')
+                ->label('zmm mtrlofconst')
+                ->exampleHeader('zmm mtrlofconst')
                 ->example(''),
             ImportColumn::make('zmm_nde')
-                ->label('ZMM NDE')
-                ->exampleHeader('ZMM NDE')
+                ->label('zmm nde')
+                ->exampleHeader('zmm nde')
                 ->example(''),
             ImportColumn::make('zmm_powerfactor')
-                ->label('ZMM POWERFACTOR')
-                ->exampleHeader('ZMM POWERFACTOR')
+                ->label('zmm powerfactor')
+                ->exampleHeader('zmm powerfactor')
                 ->example(''),
             ImportColumn::make('zmm_tagno')
-                ->label('ZMM TAGNO')
-                ->exampleHeader('ZMM TAGNO')
+                ->label('zmm tagno')
+                ->exampleHeader('zmm tagno')
                 ->example(''),
             ImportColumn::make('zmm_year')
-                ->label('ZMM YEAR')
-                ->exampleHeader('ZMM YEAR')
+                ->label('zmm year')
+                ->exampleHeader('zmm year')
                 ->example(''),
             ImportColumn::make('zmm_laser_name')
-                ->label('ZMM LASER NAME')
-                ->exampleHeader('ZMM LASER NAME')
-                ->example(''),
-            ImportColumn::make('zmm_logo_cp')
-                ->label('ZMM LOGO CP')
-                ->exampleHeader('ZMM LOGO CP')
-                ->example(''),
-            ImportColumn::make('zmm_logo_ce')
-                ->label('ZMM LOGO CE')
-                ->exampleHeader('ZMM LOGO CE')
-                ->example('NO'),
-            ImportColumn::make('zmm_logo_nsf')
-                ->label('ZMM LOGO NSF')
-                ->exampleHeader('ZMM LOGO NSF')
+                ->label('zmm laser name')
+                ->exampleHeader('zmm laser name')
                 ->example(''),
             ImportColumn::make('zmm_beenote')
-                ->label('ZMM BEENOTE')
-                ->exampleHeader('ZMM BEENOTE')
+                ->label('zmm beenote')
+                ->exampleHeader('zmm beenote')
                 ->example(''),
             ImportColumn::make('zmm_beenumber')
-                ->label('ZMM BEENUMBER')
-                ->exampleHeader('ZMM BEENUMBER')
+                ->label('zmm beenumber')
+                ->exampleHeader('zmm beenumber')
                 ->example(''),
             ImportColumn::make('zmm_beestar')
-                ->label('ZMM BEESTAR')
-                ->exampleHeader('ZMM BEESTAR')
+                ->label('zmm beenumber')
+                ->exampleHeader('zmm beenumber')
                 ->example(''),
             ImportColumn::make('zmm_codeclass')
-                ->label('ZMM CODECLASS')
-                ->exampleHeader('ZMM CODECLASS')
+                ->label('zmm codeclass')
+                ->exampleHeader('zmm codeclass')
                 ->example(''),
             ImportColumn::make('zmm_colour')
-                ->label('ZMM COLOUR')
-                ->exampleHeader('ZMM COLOUR')
+                ->label('zmm colour')
+                ->exampleHeader('zmm colour')
+                ->example(''),
+            ImportColumn::make('zmm_logo_cp')
+                ->label('zmm logo cp')
+                ->exampleHeader('zmm logo cp')
+                ->example(''),
+            ImportColumn::make('zmm_logo_ce')
+                ->label('zmm logo ce')
+                ->exampleHeader('zmm logo ce')
+                ->example(''),
+            ImportColumn::make('zmm_logo_nsf')
+                ->label('zmm logo nsf')
+                ->exampleHeader('zmm logo nsf')
                 ->example(''),
             ImportColumn::make('zmm_grade')
-                ->label('ZMM GRADE')
-                ->exampleHeader('ZMM GRADE')
+                ->label('zmm grade')
+                ->exampleHeader('zmm grade')
                 ->example(''),
             ImportColumn::make('zmm_grwt_pset')
-                ->label('ZMM GRWT PSET')
-                ->exampleHeader('ZMM GRWT PSET')
+                ->label('zmm grwt pset')
+                ->exampleHeader('zmm grwt pset')
                 ->example(''),
             ImportColumn::make('zmm_grwt_cable')
-                ->label('ZMM GRWT CABLE')
-                ->exampleHeader('ZMM GRWT CABLE')
+                ->label('zmm grwt cable')
+                ->exampleHeader('zmm grwt cable')
                 ->example(''),
             ImportColumn::make('zmm_grwt_motor')
-                ->label('ZMM GRWT MOTOR')
-                ->exampleHeader('ZMM GRWT MOTOR')
+                ->label('zmm grwt motor')
+                ->exampleHeader('zmm grwt motor')
                 ->example(''),
             ImportColumn::make('zmm_grwt_pf')
-                ->label('ZMM GRWT PF')
-                ->exampleHeader('ZMM GRWT PF')
+                ->label('zmm grwt pf')
+                ->exampleHeader('zmm grwt pf')
                 ->example(''),
             ImportColumn::make('zmm_grwt_pump')
-                ->label('ZMM GRWT PUMP')
-                ->exampleHeader('ZMM GRWT PUMP')
+                ->label('zmm grwt pump')
+                ->exampleHeader('zmm grwt pump')
                 ->example(''),
             ImportColumn::make('zmm_isivalve')
-                ->label('ZMM ISIVALVE')
-                ->exampleHeader('ZMM ISIVALVE')
+                ->label('zmm isivalve')
+                ->exampleHeader('zmm isivalve')
                 ->example(''),
             ImportColumn::make('zmm_isi_wc')
-                ->label('ZMM ISI WC')
-                ->exampleHeader('ZMM ISI WC')
+                ->label('zmm isi wc')
+                ->exampleHeader('zmm isi wc')
                 ->example(''),
             ImportColumn::make('zmm_labelperiod')
-                ->label('ZMM LABELPERIOD')
-                ->exampleHeader('ZMM LABELPERIOD')
+                ->label('zmm labelperiod')
+                ->exampleHeader('zmm labelperiod')
                 ->example(''),
             ImportColumn::make('zmm_length')
-                ->label('ZMM LENGTH')
-                ->exampleHeader('ZMM LENGTH')
+                ->label('zmm length')
+                ->exampleHeader('zmm length')
                 ->example(''),
             ImportColumn::make('zmm_license_cml_no')
-                ->label('ZMM LICENSE CML NO')
-                ->exampleHeader('ZMM LICENSE CML NO')
+                ->label('zmm license cml no')
+                ->exampleHeader('zmm license cml no')
                 ->example(''),
             ImportColumn::make('zmm_mfgmonyr')
-                ->label('ZMM MFGMONYR')
-                ->exampleHeader('ZMM MFGMONYR')
+                ->label('zmm mfgmonyr')
+                ->exampleHeader('zmm mfgmonyr')
                 ->example(''),
             ImportColumn::make('zmm_modelyear')
-                ->label('ZMM MODELYEAR')
-                ->exampleHeader('ZMM MODELYEAR')
+                ->label('zmm modelyear')
+                ->exampleHeader('zmm modelyear')
                 ->example(''),
             ImportColumn::make('zmm_motoridentification')
-                ->label('ZMM MOTORIDENTIFICATION')
-                ->exampleHeader('ZMM MOTORIDENTIFICATION')
+                ->label('zmm motoridentification')
+                ->exampleHeader('zmm motoridentification')
                 ->example(''),
             ImportColumn::make('zmm_newt_pset')
-                ->label('ZMM NEWT PSET')
-                ->exampleHeader('ZMM NEWT PSET')
+                ->label('zmm newt pset')
+                ->exampleHeader('zmm newt pset')
                 ->example(''),
             ImportColumn::make('zmm_newt_cable')
-                ->label('ZMM NEWT CABLE')
-                ->exampleHeader('ZMM NEWT CABLE')
+                ->label('zmm newt cable')
+                ->exampleHeader('zmm newt cable')
                 ->example(''),
             ImportColumn::make('zmm_newt_motor')
-                ->label('ZMM NEWT MOTOR')
-                ->exampleHeader('ZMM NEWT MOTOR')
+                ->label('zmm newt motor')
+                ->exampleHeader('zmm newt motor')
                 ->example(''),
             ImportColumn::make('zmm_newt_pf')
-                ->label('ZMM NEWT PF')
-                ->exampleHeader('ZMM NEWT PF')
+                ->label('zmm newt pf')
+                ->exampleHeader('zmm newt pf')
                 ->example(''),
             ImportColumn::make('zmm_newt_pump')
-                ->label('ZMM NEWT PUMP')
-                ->exampleHeader('ZMM NEWT PUMP')
+                ->label('zmm newt pump')
+                ->exampleHeader('zmm newt pump')
                 ->example(''),
             ImportColumn::make('zmm_packtype')
-                ->label('ZMM PACKTYPE')
-                ->exampleHeader('ZMM PACKTYPE')
+                ->label('zmm packtype')
+                ->exampleHeader('zmm packtype')
                 ->example(''),
             ImportColumn::make('zmm_panel')
-                ->label('ZMM PANEL')
-                ->exampleHeader('ZMM PANEL')
+                ->label('zmm panel')
+                ->exampleHeader('zmm panel')
                 ->example(''),
             ImportColumn::make('zmm_performance_factor')
-                ->label('ZMM PERFORMANCE FACTOR')
-                ->exampleHeader('ZMM PERFORMANCE FACTOR')
+                ->label('zmm performance factor')
+                ->exampleHeader('zmm performance factor')
                 ->example(''),
             ImportColumn::make('zmm_pumpidentification')
-                ->label('ZMM PUMPIDENTIFICATION')
-                ->exampleHeader('ZMM PUMPIDENTIFICATION')
+                ->label('zmm pumpidentification')
+                ->exampleHeader('zmm pumpidentification')
                 ->example(''),
             ImportColumn::make('zmm_psettype')
-                ->label('ZMM PSETTYPE')
-                ->exampleHeader('ZMM PSETTYPE')
+                ->label('zmm psettype')
+                ->exampleHeader('zmm psettype')
                 ->example(''),
             ImportColumn::make('zmm_size')
-                ->label('ZMM SIZE')
-                ->exampleHeader('ZMM SIZE')
+                ->label('zmm size')
+                ->exampleHeader('zmm size')
                 ->example(''),
             ImportColumn::make('zmm_eff_ttl')
-                ->label('ZMM EFF TTL')
-                ->exampleHeader('ZMM EFF TTL')
+                ->label('zmm eff ttl')
+                ->exampleHeader('zmm eff ttl')
                 ->example(''),
             ImportColumn::make('zmm_type')
-                ->label('ZMM TYPE')
-                ->exampleHeader('ZMM TYPE')
+                ->label('zmm type')
+                ->exampleHeader('zmm type')
                 ->example(''),
             ImportColumn::make('zmm_usp')
-                ->label('ZMM USP')
-                ->exampleHeader('ZMM USP')
+                ->label('zmm usp')
+                ->exampleHeader('zmm usp')
                 ->example(''),
             ImportColumn::make('mark_status')
                 ->label('MARKED STATUS')
@@ -542,23 +535,15 @@ class ClassCharacteristicImporter extends Importer
             ImportColumn::make('marked_datetime')
                 ->label('MARKED DATETIME')
                 ->exampleHeader('MARKED DATETIME')
-                ->example('01-01-2026 00:08:00'),
-            ImportColumn::make('marked_physical_count')
-                ->label('MARKED PHYSICAL COUNT')
-                ->exampleHeader('MARKED PHYSICAL COUNT')
-                ->example('0'),
-            ImportColumn::make('marked_expected_time')
-                ->label('MARKED EXPECTED TIME')
-                ->exampleHeader('MARKED EXPECTED TIME')
-                ->example('0'),
+                ->example(''),
             ImportColumn::make('marked_by')
                 ->label('MARKED BY')
                 ->exampleHeader('MARKED BY')
-                ->example('TEST001'),
+                ->example(''),
             ImportColumn::make('man_marked_status')
-                ->label('MANUAL MARKED PHYSICAL COUNT')
+                ->label('MANUAL MARKED STATUS')
                 ->exampleHeader('MANUAL MARKED STATUS')
-                ->example('0'),
+                ->example(''),
             ImportColumn::make('man_marked_datetime')
                 ->label('MANUAL MARKED DATETIME')
                 ->exampleHeader('MANUAL MARKED DATETIME')
@@ -571,14 +556,6 @@ class ClassCharacteristicImporter extends Importer
                 ->label('MOTOR MARKED STATUS')
                 ->exampleHeader('MOTOR MARKED STATUS')
                 ->example(''),
-            ImportColumn::make('motor_marked_physical_count')
-                ->label('MOTOR MARKED PHYSICAL COUNT')
-                ->exampleHeader('MOTOR MARKED PHYSICAL COUNT')
-                ->example('0'),
-            ImportColumn::make('motor_expected_time')
-                ->label('MOTOR EXPECTED TIME')
-                ->exampleHeader('MOTOR EXPECTED TIME')
-                ->example('0'),
             ImportColumn::make('motor_marked_by')
                 ->label('MOTOR MARKED BY')
                 ->exampleHeader('MOTOR MARKED BY')
@@ -587,38 +564,14 @@ class ClassCharacteristicImporter extends Importer
                 ->label('PUMP MARKED STATUS')
                 ->exampleHeader('PUMP MARKED STATUS')
                 ->example(''),
-            ImportColumn::make('pump_marked_physical_count')
-                ->label('PUMP MARKED PHYSICAL COUNT')
-                ->exampleHeader('PUMP MARKED PHYSICAL COUNT')
-                ->example('0'),
-            ImportColumn::make('pump_expected_time')
-                ->label('PUMP EXPECTED TIME')
-                ->exampleHeader('PUMP EXPECTED TIME')
-                ->example('0'),
             ImportColumn::make('pump_marked_by')
                 ->label('PUMP MARKED BY')
                 ->exampleHeader('PUMP MARKED BY')
                 ->example(''),
-            ImportColumn::make('name_plate_marked_status')
-                ->label('NAME PLATE MARKED STATUS')
-                ->exampleHeader('NAME PLATE MARKED STATUS')
-                ->example(''),
-            ImportColumn::make('name_plate_expected_time')
-                ->label('NAME PLATE EXPECTED TIME')
-                ->exampleHeader('NAME PLATE EXPECTED TIME')
-                ->example('0'),
-            ImportColumn::make('name_plate_marked_by')
-                ->label('NAME PLATE MARKED BY')
-                ->exampleHeader('NAME PLATE MARKED BY')
-                ->example(''),
             ImportColumn::make('motor_pump_pumpset_status')
                 ->label('MOTOR PUMP PUMPSET STATUS')
                 ->exampleHeader('MOTOR PUMP PUMPSET STATUS')
                 ->example(''),
-            ImportColumn::make('winded_serial_number')
-                ->label('WINDED SERIAL NUMBER')
-                ->exampleHeader('WINDED SERIAL NUMBER')
-                ->example(''),
             ImportColumn::make('motor_machine_name')
                 ->label('MOTOR MACHINE NAME')
                 ->exampleHeader('MOTOR MACHINE NAME')
@@ -627,10 +580,6 @@ class ClassCharacteristicImporter extends Importer
                 ->label('PUMP MACHINE NAME')
                 ->exampleHeader('PUMP MACHINE NAME')
                 ->example(''),
-            ImportColumn::make('name_plate_machine_name')
-                ->label('NAME PLATE MACHINE NAME')
-                ->exampleHeader('NAME PLATE MACHINE NAME')
-                ->example(''),
             ImportColumn::make('pumpset_machine_name')
                 ->label('PUMPSET MACHINE NAME')
                 ->exampleHeader('PUMPSET MACHINE NAME')
@@ -651,26 +600,31 @@ class ClassCharacteristicImporter extends Importer
                 ->label('PENDING RELEASED STATUS')
                 ->exampleHeader('PENDING RELEASED STATUS')
                 ->example(''),
-            ImportColumn::make('has_work_flow_id')
-                ->label('HAS WORK FLOW ID')
-                ->exampleHeader('HAS WORK FLOW ID')
-                ->example('0'),
+            ImportColumn::make('motor_expected_time')
+                ->label('MOTOR EXPECTED TIME')
+                ->exampleHeader('MOTOR EXPECTED TIME')
+                ->example(''),
+            ImportColumn::make('pump_expected_time')
+                ->label('PUMP EXPECTED TIME')
+                ->exampleHeader('PUMP EXPECTED TIME')
+                ->example(''),
             ImportColumn::make('created_at')
                 ->label('CREATED AT')
                 ->exampleHeader('CREATED AT')
-                ->example('01-01-2026 00:08:00'),
+                ->example(''),
             ImportColumn::make('created_by')
                 ->label('CREATED BY')
                 ->exampleHeader('CREATED BY')
-                ->example('TEST001'),
+                ->example('RAW01234'),
             ImportColumn::make('updated_at')
                 ->label('UPDATED AT')
                 ->exampleHeader('UPDATED AT')
-                ->example('01-01-2026 00:08:00'),
+                ->example(''),
             ImportColumn::make('updated_by')
                 ->label('UPDATED BY')
                 ->exampleHeader('UPDATED BY')
-                ->example('TEST001'),
+                ->example(''),
+            // ImportColumn::make('updated_by'),
         ];
     }
 

app/Filament/Imports/ProcessOrderImporter.php

@@ -6,7 +6,6 @@ use App\Models\Item;
 use App\Models\Line;
 use App\Models\Plant;
 use App\Models\ProcessOrder;
-use App\Models\ProductCharacteristicsMaster;
 use App\Models\User;
 use Filament\Actions\Imports\Exceptions\RowImportFailedException;
 use Filament\Actions\Imports\ImportColumn;
@@ -31,7 +30,7 @@ class ProcessOrderImporter extends Importer
                 ->rules(['required']),
             ImportColumn::make('line')
                 ->exampleHeader('LINE NAME')
-                ->example('Poly Wrapped Wire SFG')
+                ->example(' Poly Wrapped Wire SFG')
                 ->label('LINE NAME')
                 ->relationship(resolveUsing: 'name'),
             ImportColumn::make('item')
@@ -44,7 +43,7 @@ class ProcessOrderImporter extends Importer
             ImportColumn::make('process_order')
                 ->requiredMapping()
                 ->exampleHeader('PROCESS ORDER')
-                ->example('202601123456')
+                ->example('2025002123456')
                 ->label('PROCESS ORDER')
                 ->rules(['required']),
             ImportColumn::make('order_quantity')
@@ -53,9 +52,6 @@ class ProcessOrderImporter extends Importer
                 ->example('1000')
                 ->label('ORDER QUANTITY')
                 ->rules(['required']),
-            ImportColumn::make('updated_order_quantity')
-                ->exampleHeader('UPDATED ORDER QUANTITY')
-                ->label('UPDATED ORDER QUANTITY'),
             ImportColumn::make('coil_number')
                 ->exampleHeader('COIL NUMBER')
                 // ->example('01')
@@ -105,16 +101,15 @@ class ProcessOrderImporter extends Importer
         $plant = null;
         $plantCod = trim($this->data['plant']) ?? '';
         $plantId = null;
+        $item = null;
         $iCode = trim($this->data['item']) ?? '';
         $itemId = null;
         $lineNam = trim($this->data['line']) ?? '';
-        $lineId = null;
         $processOrder = trim($this->data['process_order'] ?? '');
         $coilNo = trim($this->data['coil_number'] ?? '');
         $sfgNo = trim($this->data['sfg_number'] ?? '');
         $machineName = trim($this->data['machine_name'] ?? '');
         $orderQuan = trim($this->data['order_quantity'] ?? '');
-        $updatedOrderQuan = trim($this->data['updated_order_quantity'] ?? '');
         $scrapQuan = trim($this->data['scrap_quantity'] ?? '');
         $reworkStatus = trim($this->data['rework_status'] ?? '');
         $recQuan = trim($this->data['received_quantity'] ?? '');
@@ -133,14 +128,11 @@ class ProcessOrderImporter extends Importer
         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!';
+            $warnMsg[] = 'Invalid item code found';
         }
         if ($processOrder == null || $processOrder == '') {
             $warnMsg[] = "Process order can't be empty!";
-        } elseif ($processOrder && (Str::contains($processOrder, '.') || Str::contains($processOrder, 'E', ignoreCase: true))) {
+        } elseif ($processOrder && Str::contains($processOrder, '.')) {
             $warnMsg[] = 'Invalid process order found!';
         }
         if ($lineNam == null || $lineNam == '') {
@@ -153,12 +145,6 @@ class ProcessOrderImporter extends Importer
         } elseif (Str::length($orderQuan) >= 1 && ! is_numeric($orderQuan)) {
             $warnMsg[] = 'Invalid order quantity found!';
         }
-        if ($updatedOrderQuan == null || $updatedOrderQuan == '' || $updatedOrderQuan == 0 || $updatedOrderQuan == '0') {
-            $updatedOrderQuan = $orderQuan;
-        } elseif (Str::length($updatedOrderQuan) >= 1 && ! is_numeric($updatedOrderQuan)) {
-            $warnMsg[] = 'Invalid Updated order quantity found!';
-        }
-
         if ($coilNo == null || $coilNo == '') {
             $coilNo = '0';
         }
@@ -173,7 +159,7 @@ class ProcessOrderImporter extends Importer
         } elseif ($reworkStatus == 1 || $reworkStatus = '1') {
             $reworkStatus = 1;
         } else {
-            $warnMsg[] = 'Invalid rework status found!';
+            $warnMsg[] = 'Invalid rework status found';
         }
 
         if (! empty($warnMsg)) {
@@ -231,26 +217,14 @@ class ProcessOrderImporter extends Importer
             }
         }
 
-        if ($plantId && $itemId && $lineId && $processOrder != '') {
+        if ($plantId && $itemCode && $lineId && $processOrder != '') {
             $existingOrder = ProcessOrder::where('plant_id', $plantId)
                 ->where('process_order', $processOrder)
                 ->first();
 
             if ($existingOrder && $existingOrder->item_id !== ($itemId ?? null)) {
-                $warnMsg[] = 'Same Process Order already exists for this Plant with a different Item Code!';
+                $warnMsg[] = 'Same Process Order already exists for this Plant with a different Item Code';
             }
-
-            // $masterExist = ProductCharacteristicsMaster::where('plant_id', $plantId)->where('item_id', $itemId)->first();
-
-            // if (! $masterExist) {
-            //     $warnMsg[] = 'Characteristics master not found for the given plant!';
-            // } else {
-            //     $masterExist = ProductCharacteristicsMaster::where('plant_id', $plantId)->where('line_id', $lineId)->where('item_id', $itemId)->first();
-
-            //     if (! $masterExist) {
-            //         $warnMsg[] = 'Characteristics master not found for the given line!';
-            //     }
-            // }
         }
 
         // $user = User::where('name', $this->data['created_by'])->first();
@@ -269,39 +243,6 @@ class ProcessOrderImporter extends Importer
             throw new RowImportFailedException(implode(', ', $warnMsg));
         }
 
-        $existing = ProcessOrder::where('plant_id', $plantId)
-            ->where('process_order', $processOrder)
-            // ->where('coil_number', $coilNo)
-            ->first();
-
-        $receivedQty = ProcessOrder::where('plant_id', $plantId)
-            ->where('process_order', $processOrder)
-            ->sum('received_quantity');
-
-        if ($existing) {
-            $liveOrdQuan = (float) $existing->order_quantity;
-            $liveUpdatedOrdQuan = (float) $existing->updated_order_quantity;
-
-            $allowedIncrease = $liveOrdQuan * 0.10;
-
-            $maxAllowedQty = $liveOrdQuan + $allowedIncrease;
-            $minAllowedQty = $liveOrdQuan - $allowedIncrease;
-
-            if ($liveUpdatedOrdQuan > $maxAllowedQty) {
-                throw new RowImportFailedException(
-                    "Updated order quantity cannot exceed 10% of existing order quantity. Max allowed: {$maxAllowedQty}!"
-                );
-            } elseif ($liveUpdatedOrdQuan < $minAllowedQty) {
-                throw new RowImportFailedException(
-                    "Updated order quantity cannot decrease -10% of existing order quantity. Min allowed: {$minAllowedQty}!"
-                );
-            } elseif ($liveUpdatedOrdQuan < $receivedQty) {
-                throw new RowImportFailedException(
-                    "Updated order quantity cannot decrease below its received quantity {$receivedQty}!"
-                );
-            }
-        }
-
         if ($coilNo != null && $coilNo != '' && $scrapQuan && $reworkStatus && $recQuan && $createdAt && $createdBy && $updatedAt && $updatedBy && Filament::auth()->user()->hasRole('Super Admin')) {
             $existingCoil = ProcessOrder::where('plant_id', $plantId)
                 ->where('process_order', $processOrder)
@@ -309,17 +250,6 @@ class ProcessOrderImporter extends Importer
                 ->where('coil_number', $coilNo)
                 ->first();
 
-            // $existingProcess = ProcessOrder::where('plant_id', $plantId)
-            //     ->where('process_order', $processOrder)
-            //     ->where('line_id', $lineId)
-            //     ->first();
-
-            if ($existing) {
-                $existUpdateOrdQuan = $existing->updated_order_quantity;
-            } else {
-                $existUpdateOrdQuan = $updatedOrderQuan;
-            }
-
             if (! $existingCoil) {
                 ProcessOrder::Create(
                     [
@@ -329,7 +259,6 @@ class ProcessOrderImporter extends Importer
                         'item_id' => $itemId,
                         'coil_number' => $coilNo,
                         'order_quantity' => $orderQuan,
-                        'updated_order_quantity' => $existUpdateOrdQuan,
                         'received_quantity' => $recQuan,
                         'scrap_quantity' => $scrapQuan,
                         'sfg_number' => $sfgNo,
@@ -359,16 +288,10 @@ class ProcessOrderImporter extends Importer
             }
         } else {
             $coilNo = '0';
-            // $existing = ProcessOrder::where('plant_id', $plantId)
-            //     ->where('process_order', $processOrder)
-            //     // ->where('coil_number', $coilNo)
-            //     ->first();
-
-            if ($existing) {
-                $existUpdateOrdQuan = $existing->updated_order_quantity;
-            } else {
-                $existUpdateOrdQuan = $updatedOrderQuan;
-            }
+            $existing = ProcessOrder::where('plant_id', $plantId)
+                ->where('process_order', $processOrder)
+                // ->where('coil_number', $coilNo)
+                ->first();
 
             if (! $existing && ($coilNo == '0' || $coilNo == 0)) {
                 ProcessOrder::create([
@@ -378,7 +301,6 @@ class ProcessOrderImporter extends Importer
                     'process_order' => $processOrder,
                     'coil_number' => '0',
                     'order_quantity' => $orderQuan,
-                    'updated_order_quantity' => $existUpdateOrdQuan,
                     'received_quantity' => 0,
                     'scrap_quantity' => 0,
                     'created_by' => $createdBy,
@@ -393,7 +315,6 @@ class ProcessOrderImporter extends Importer
                         'process_order' => $processOrder,
                         'coil_number' => $coilNo,
                         'order_quantity' => $orderQuan,
-                        'updated_order_quantity' => $existUpdateOrdQuan,
                         'received_quantity' => $recQuan,
                         'scrap_quantity' => $scrapQuan ?? 0,
                         'sfg_number' => $sfgNo,

app/Filament/Imports/StockDataMasterImporter.php

@@ -1,234 +0,0 @@
-<?php
-
-namespace App\Filament\Imports;
-
-use App\Models\Item;
-use App\Models\Plant;
-use App\Models\StickerMaster;
-use App\Models\StockDataMaster;
-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 StockDataMasterImporter extends Importer
-{
-    protected static ?string $model = StockDataMaster::class;
-
-    public static function getColumns(): array
-    {
-        return [
-            ImportColumn::make('plant')
-                ->requiredMapping()
-                ->exampleHeader('PLANT CODE')
-                ->examples(['1000', '1000'])
-                ->label('PLANT CODE')
-                ->relationship(resolveUsing: 'code')
-                ->rules(['required']),
-            ImportColumn::make('type')
-                ->requiredMapping()
-                ->exampleHeader('TYPE')
-                ->examples(['FG', 'NON-FG'])
-                ->label('TYPE'),
-            ImportColumn::make('location')
-                ->requiredMapping()
-                ->exampleHeader('LOCATION')
-                ->examples(['2001', '2002'])
-                ->label('LOCATION')
-                ->rules(['required']),
-            ImportColumn::make('item_reference')
-                ->requiredMapping()
-                ->exampleHeader('ITEM CODE')
-                ->examples(['123456', '246118'])
-                ->label('ITEM CODE')
-                ->rules(['required']),
-            ImportColumn::make('serial_number')
-                ->requiredMapping()
-                ->exampleHeader('SERIAL NUMBER')
-                ->examples(['200235236622', '200235236623'])
-                ->label('SERIAL NUMBER'),
-            ImportColumn::make('batch')
-                ->requiredMapping()
-                ->exampleHeader('BATCH')
-                ->examples(['20102', '20103'])
-                ->label('BATCH'),
-            ImportColumn::make('quantity')
-                ->requiredMapping()
-                ->exampleHeader('QUANTITY')
-                ->examples(['1', '1'])
-                ->label('QUANTITY'),
-            ImportColumn::make('doc_no')
-                ->requiredMapping()
-                ->exampleHeader('DOCUMENT NUMBER')
-                ->examples(['82128', '21222'])
-                ->label('DOCUMENT NUMBER'),
-        ];
-    }
-
-    public function resolveRecord(): ?StockDataMaster
-    {
-        $warnMsg = [];
-        $plantId = null;
-        $stickId = null;
-
-        $plantCod = $this->data['plant'];
-        $typeValue = $this->data['type'];
-        $iCode = trim($this->data['item_reference']) ?? null;
-        $location = trim($this->data['location']) ?? null;
-        $serialNumber = trim($this->data['serial_number']) ?? null;
-        $batch = trim($this->data['batch']) ?? null;
-        $quantity = trim($this->data['quantity']) ?? null;
-        $docNo = trim($this->data['doc_no']) ?? null;
-
-        $user = Filament::auth()->user();
-
-        $operatorName = $user->name;
-
-        if ($plantCod == null || $plantCod == '') {
-            $warnMsg[] = "Plant code can't be empty!";
-        } elseif ($typeValue == null || $typeValue == '') {
-            $warnMsg[] = "Type can't be empty!";
-        } elseif ($iCode == null || $iCode == '') {
-            $warnMsg[] = "Item code can't be empty!";
-        } elseif ($location == null || $location == '') {
-            $warnMsg[] = "Location can't be empty!";
-        } elseif ($serialNumber == null || $serialNumber == '') {
-            $warnMsg[] = "Serial number can't be empty!";
-        }
-        // else if ($batch == null || $batch == '') {
-        //     $warnMsg[] = "Batch can't be empty!";
-        // }
-        elseif ($quantity == null || $quantity == '') {
-            $warnMsg[] = "Quantity can't be empty!";
-        }
-        // else if ($docNo == null || $docNo == '') {
-        //     $warnMsg[] = "Doc No can't be empty!";
-        // }
-
-        if (Str::length($plantCod) > 0 && (Str::length($plantCod) < 4 || ! is_numeric($plantCod) || ! preg_match('/^[1-9]\d{3,}$/', $plantCod))) {
-            $warnMsg[] = 'Invalid plant code found!';
-        } elseif (Str::length($plantCod) > 0) {
-            $plant = Plant::where('code', $plantCod)->first();
-            if (! $plant) {
-                $warnMsg[] = 'Plant code not found!';
-            } else {
-                $plantId = $plant->id;
-            }
-        }
-
-        if (Str::length($iCode) > 0 && (Str::length($iCode) < 6 || ! ctype_alnum($iCode))) {
-            $warnMsg[] = 'Invalid item code found!';
-        } elseif ($plantId) {
-            $itemCode = Item::where('code', $iCode)->first();
-            if (! $itemCode) {
-                $warnMsg[] = 'Item code not found in item master!';
-            } else {
-                $itemCode = Item::where('code', $iCode)->where('plant_id', $plantId)->first();
-                if (! $itemCode) {
-                    $warnMsg[] = 'Item code not found in item master for the given plant!';
-                } else {
-                    $itemId = $itemCode->id;
-                    $itemCode = StickerMaster::where('item_id', $itemId)->first();
-                    if (! $itemCode) {
-                        $warnMsg[] = 'Item code not found in sticker master!';
-                    } else {
-                        if ($plantId) {
-                            $itemCode = StickerMaster::where('item_id', $itemId)->where('plant_id', $plantId)->first();
-                            if (! $itemCode) {
-                                $warnMsg[] = 'Item code not found in sticker master for the given plant!';
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        $typeValue = strtoupper($typeValue);
-
-        if (! in_array($typeValue, ['FG', 'NON-FG'])) {
-            $warnMsg[] = 'Invalid type found! It should be either FG or NON-FG.';
-        } elseif (Str::length($location) < 4) {
-            $warnMsg[] = 'Location should contain minimum 4 digits!';
-        } elseif (! ctype_digit((string) $location)) {
-            $warnMsg[] = 'Location must be an integer!';
-        } elseif (Str::length($serialNumber) < 9) {
-            $warnMsg[] = 'Serial number should contain minimum 9 digits!';
-        } elseif (! ctype_alnum($serialNumber)) {
-            $warnMsg[] = 'Serial number should contain alpha-numeric values!';
-        } elseif (! ctype_digit((string) $quantity) || (int) $quantity <= 0) {
-            $warnMsg[] = 'Quantity must be an integer and greater than 0!';
-        }
-
-        if ($batch) {
-            if (Str::length($batch) < 5) {
-                $warnMsg[] = 'Batch should contain minimum 5 digits!';
-            }
-        }
-
-        if ($docNo) {
-            if (Str::length($docNo) < 5) {
-                $warnMsg[] = 'Document number contain minimum 5 digits!';
-            }
-        }
-
-        if (! empty($warnMsg)) {
-            throw new RowImportFailedException(implode(', ', $warnMsg));
-        }
-
-        $type = match ($typeValue) {
-            'FG' => '0',
-            'NON-FG' => '1',
-            default => null,
-        };
-
-        $stickId = $itemCode->id;
-
-        $record = StockDataMaster::where([
-            'plant_id' => $plantId,
-            'sticker_master_id' => $stickId,
-            'serial_number' => $serialNumber,
-        ])->first();
-
-        if ($record) {
-
-            $record->update([
-                'type' => $type,
-                'location' => $location ?? null,
-                'batch' => $batch ?? null,
-                'quantity' => $quantity ?? null,
-                'doc_no' => $docNo ?? null,
-                'updated_by' => $operatorName,
-            ]);
-
-        } else {
-
-            StockDataMaster::create([
-                'plant_id' => $plantId,
-                'sticker_master_id' => $stickId,
-                'type' => $type,
-                'location' => $location ?? null,
-                'serial_number' => $serialNumber ?? null,
-                'batch' => $batch ?? null,
-                'quantity' => $quantity ?? null,
-                'doc_no' => $docNo ?? null,
-                'created_by' => $operatorName,
-                'updated_by' => $operatorName,
-            ]);
-        }
-
-        return null;
-    }
-
-    public static function getCompletedNotificationBody(Import $import): string
-    {
-        $body = 'Your stock data master import has completed and '.number_format($import->successful_rows).' '.str('row')->plural($import->successful_rows).' imported.';
-
-        if ($failedRowsCount = $import->getFailedRowsCount()) {
-            $body .= ' '.number_format($failedRowsCount).' '.str('row')->plural($failedRowsCount).' failed to import.';
-        }
-
-        return $body;
-    }
-}

app/Filament/Pages/Dashboard.php

@@ -2,7 +2,6 @@
 namespace App\Filament\Pages;
 
 use App\Filament\Widgets\CumulativeChart;
-use App\Filament\Widgets\ProductionQuantityStat;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
@@ -10,8 +9,6 @@ use Filament\Pages\Dashboard\Concerns\HasFiltersForm;
 use Filament\Tables\Filters\SelectFilter;
 use Illuminate\Support\Facades\DB;
 use App\Models\Plant;
-use Filament\Facades\Filament;
-use Filament\Forms\Components\DatePicker;
 use Filament\Widgets\Widget;
 use Illuminate\Support\Facades\Auth;
 
@@ -19,108 +16,57 @@ class Dashboard extends \Filament\Pages\Dashboard
 {
    use HasFiltersForm;
 
-    protected static ?string $navigationIcon = 'heroicon-s-gift';
+   protected static ?string $navigationGroup = 'Production DashBoard';
 
-    protected static string $view = 'filament.pages.dashboard';
-
-//     public function mount(): void
-//     {
-//        session()->forget(['selected_plant']);
-//        session()->forget(['from_date']);
-//        session()->forget(['to_date']);
-//        $this->filtersForm->fill([
-//            'plant' => null,
-//            'from_date' => null,
-//            'to_date' => null,
-//         // 'success_status' => null
-//        ]);
-//    }
-
-//     public function filtersForm(Form $form): Form
-//     {
-//        return $form
-//            ->statePath('filters') // Store form state in 'filters'
-//            ->schema([
-//                 Select::make('plant')
-//                     ->label('Select Plant')
-//                     ->reactive()
-//                     // ->options(Plant::pluck('name', 'id'))
-//                     ->options(function (callable $get) {
-//                         $userHas = Filament::auth()->user()->plant_id;
-//                         return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::pluck('name', 'id')->toArray();
-//                     })
-//                     ->afterStateUpdated(function ($state,callable $set) {
-//                         session(['selected_plant' => $state]); // fixed typo
-//                         //$this->dispatch('cumulativeChart'); // custom Livewire event
-//                             // Reset success_status whenever plant changes
-//                             $set('success_status', null);
-//                             session()->forget('success_status');
-//                     }),
-
-//                 // Select::make('success_status')
-//                 //     ->label('Select Status')
-//                 //     ->options([
-//                 //             'Ok'     => 'Ok',
-//                 //             'Not Ok' => 'Not Ok',
-//                 //         ])
-//                 //     ->reactive()
-//                 //     ->afterStateUpdated(function ($state) {
-//                 //         session(['success_status' => $state]);
-//                 //     }),
-
-//                 DatePicker::make('created_from')
-//                     ->label('Created From')
-//                     ->reactive()
-//                     ->afterStateUpdated(function ($state,callable $set) {
-//                         session(['from_date' => $state]);
-//                     }),
-
-//                 DatePicker::make('created_to')
-//                     ->label('Created To')
-//                     ->reactive()
-//                     ->afterStateUpdated(function ($state,callable $set) {
-//                         session(['to_date' => $state]);
-//                     }),
-
-//             ]);
-//     }
-
-
-//     public static function getNavigationLabel(): string
-//     {
-//         return 'Production Line Count';
-//     }
-
-//     public function getHeading(): string
-//     {
-//         return 'Production Line Count';
-//     }
-
-//     public function getWidgets(): array
-//     {
-//         $widgets = [];
-
-//         if (CumulativeChart::canView()) {
-//            $widgets[] = CumulativeChart::class;
-
-//         }
-//         return $widgets;
-//     }
-
-//     public static function canAccess(): bool
-//     {
-//         return Auth::check() && Auth::user()->can('view production line count dashboard');
-//     }
-
-
-    public function getHeading(): string
+   public function mount(): void
    {
-        return '';
+       session()->forget(['selected_plant']);
+       $this->filtersForm->fill([
+           'plant' => null
+       ]);
    }
 
+   public function filtersForm(Form $form): Form
+   {
+       return $form
+           ->statePath('filters') // Store form state in 'filters'
+           ->schema([
+               Select::make('plant')
+                   ->options(Plant::pluck('name', 'id'))
+                   ->label('Select Plant')
+                   ->reactive()
+                   ->afterStateUpdated(function ($state) {
+                       session(['selected_plant' => $state]); // fixed typo
+                       //$this->dispatch('cumulativeChart'); // custom Livewire event
+                   }),
+                ]);
+
+   }
+
+
     public static function getNavigationLabel(): string
     {
-        return 'Welcome';
+        return 'Production Line Count';
+    }
+
+    public function getHeading(): string
+    {
+        return 'Production Line Count';
+    }
+
+    public function getWidgets(): array
+    {
+        $widgets = [];
+
+        if (CumulativeChart::canView()) {
+            $widgets[] = CumulativeChart::class;
+        }
+        return $widgets;
+    }
+
+    public static function canAccess(): bool
+    {
+        return Auth::check() && Auth::user()->can('view production line count dashboard');
     }
 
 }

app/Filament/Pages/ProductionQuantityPage.php

@@ -352,8 +352,7 @@ class ProductionQuantityPage extends Page implements HasForms
                         }
                     })
                     ->extraAttributes(fn ($get) => [
-                        'id' => 'production_order',
-                        'wire:keydown.enter' => '$dispatch("focus-qr-input")',
+                        'id' => 'scan_locator_no',
                         'class' => $get('productionError') ? 'border-red-500' : '',
                     ])
                     ->hint(fn ($get) => $get('productionError') ? $get('productionError') : null)
@@ -509,11 +508,12 @@ class ProductionQuantityPage extends Page implements HasForms
                 // 'operator_id'=> $operatorName,
                 'recent_qr' => $this->recQr,
             ]);
-            $this->dispatch('focus-production-order');
             $this->triggerChartUpdate();
         }
     }
 
+    // Method to process the value when Enter is pressed
+
     #[On('handleQrScan')]
     public function handleQrScan($value)
     {
@@ -571,6 +571,7 @@ class ProductionQuantityPage extends Page implements HasForms
                 ->body('Scan the valid QR code.<br>(Ex: Item_Code|Serial_Number )')
                 ->danger()
                 ->send();
+
             return;
         } else {
             if (! $this->pId) {

app/Filament/Pages/Welcome.php

@@ -1,124 +1,23 @@
 <?php
+
 namespace App\Filament\Pages;
 
-use App\Filament\Widgets\CumulativeChart;
-use App\Filament\Widgets\ProductionQuantityStat;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Form;
-use Filament\Pages\Dashboard\Concerns\HasFiltersForm;
-use Filament\Tables\Filters\SelectFilter;
-use Illuminate\Support\Facades\DB;
-use App\Models\Plant;
-use Filament\Facades\Filament;
-use Filament\Forms\Components\DatePicker;
-use Filament\Widgets\Widget;
-use Illuminate\Support\Facades\Auth;
 use Filament\Pages\Page;
-use Filament\Forms\Concerns\InteractsWithForms;
+use Illuminate\Support\Facades\Auth;
 
 class Welcome extends Page
 {
+    protected static ?string $navigationIcon = 'heroicon-s-gift'; // 'heroicon-o-document-text';
 
     protected static string $view = 'filament.pages.welcome';
 
-    protected static ?string $navigationIcon = 'heroicon-o-document-text';
-
-    use HasFiltersForm;
-
-    use InteractsWithForms;
-
-    protected static ?string $navigationGroup = 'Production DashBoard';
-
-    protected static ?string $slug = 'production-line-count';
-
-    public function mount(): void
-    {
-       session()->forget(['selected_plant']);
-    //    session()->forget(['from_date']);
-    //    session()->forget(['to_date']);
-       $this->filtersForm->fill([
-           'plant' => null,
-        //    'from_date' => null,
-        //    'to_date' => null,
-        // 'success_status' => null
-       ]);
-   }
-
-    public function filtersForm(Form $form): Form
-    {
-       return $form
-           ->statePath('filters')
-           ->schema([
-                Select::make('plant')
-                    ->label('Select Plant')
-                    ->reactive()
-                    // ->options(Plant::pluck('name', 'id'))
-                    ->options(function (callable $get) {
-                        $userHas = Filament::auth()->user()->plant_id;
-                        return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::pluck('name', 'id')->toArray();
-                    })
-                    ->afterStateUpdated(function ($state,callable $set) {
-                        session(['selected_plant' => $state]);
-                        //$this->dispatch('cumulativeChart'); // custom Livewire event
-                            // Reset success_status whenever plant changes
-                            // $set('success_status', null);
-                            // session()->forget('success_status');
-                    }),
-
-                // Select::make('success_status')
-                //     ->label('Select Status')
-                //     ->options([
-                //             'Ok'     => 'Ok',
-                //             'Not Ok' => 'Not Ok',
-                //         ])
-                //     ->reactive()
-                //     ->afterStateUpdated(function ($state) {
-                //         session(['success_status' => $state]);
-                //     }),
-
-                // DatePicker::make('created_from')
-                //     ->label('Created From')
-                //     ->reactive()
-                //     ->afterStateUpdated(function ($state,callable $set) {
-                //         session(['from_date' => $state]);
-                //     }),
-
-                // DatePicker::make('created_to')
-                //     ->label('Created To')
-                //     ->reactive()
-                //     ->afterStateUpdated(function ($state,callable $set) {
-                //         session(['to_date' => $state]);
-                //     }),
-
-            ]);
-    }
-
-
-    public static function getNavigationLabel(): string
-    {
-        return 'Production Line Count';
-    }
-
     public function getHeading(): string
     {
-        return 'Production Line Count';
+        return '';
     }
 
-    // public function getWidgets(): array
+    // public static function canAccess(): bool
     // {
-    //     $widgets = [];
-
-    //     if (CumulativeChart::canView()) {
-    //        $widgets[] = CumulativeChart::class;
-
+    //     return Auth::check() && Auth::user()->can('view welcome page');
     // }
-    //     return $widgets;
-    // }
-
-    public static function canAccess(): bool
-    {
-        return Auth::check() && Auth::user()->can('view production line count dashboard');
-    }
-
 }

app/Filament/Resources/CharacteristicApproverMasterResource.php

@@ -3,7 +3,6 @@
 namespace App\Filament\Resources;
 
 use App\Filament\Exports\CharacteristicApproverMasterExporter;
-use App\Filament\Imports\CharacteristicApproverMasterImporter;
 use App\Filament\Resources\CharacteristicApproverMasterResource\Pages;
 use App\Models\CharacteristicApproverMaster;
 use App\Models\Machine;
@@ -399,13 +398,13 @@ class CharacteristicApproverMasterResource extends Resource
                 ]),
             ])
             ->headerActions([
-                ImportAction::make()
-                    ->label('Import Characteristics Approver Master')
-                    ->color('warning')
-                    ->importer(CharacteristicApproverMasterImporter::class)
-                    ->visible(function () {
-                        return Filament::auth()->user()->can('view import characteristic approver master');
-                    }),
+                // ImportAction::make()
+                //     ->label('Import Characteristics Approver Master')
+                //     ->color('warning')
+                //     ->importer(CharacteristicApproverMasterImporter::class)
+                //     ->visible(function () {
+                //         return Filament::auth()->user()->can('view import characteristic approver master');
+                //     }),
                 ExportAction::make()
                     ->label('Export Characteristics Approver Master')
                     ->color('warning')

app/Filament/Resources/DuplicateStockResource.php

@@ -1,181 +0,0 @@
-<?php
-
-namespace App\Filament\Resources;
-
-use App\Filament\Resources\DuplicateStockResource\Pages;
-use App\Models\DuplicateStock;
-use Filament\Facades\Filament;
-use Filament\Forms;
-use Filament\Forms\Form;
-use Filament\Resources\Resource;
-use Filament\Tables;
-use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
-
-class DuplicateStockResource extends Resource
-{
-    protected static ?string $model = DuplicateStock::class;
-
-    protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
-
-    protected static ?string $navigationGroup = 'Cycle Count Software';
-
-    public static function form(Form $form): Form
-    {
-        return $form
-            ->schema([
-                Forms\Components\Select::make('stock_data_master_id')
-                    ->relationship('stockDataMaster', 'id')
-                    ->required(),
-                Forms\Components\Hidden::make('created_by')
-                    ->label('Created By')
-                    ->default(Filament::auth()->user()?->name),
-                Forms\Components\Hidden::make('updated_by')
-                    ->label('Updated By')
-                    ->default(Filament::auth()->user()?->name),
-            ]);
-    }
-
-    public static function table(Table $table): Table
-    {
-        return $table
-            ->columns([
-                Tables\Columns\TextColumn::make('No.')
-                    ->label('No.')
-                    ->getStateUsing(function ($record, $livewire, $column, $rowLoop) {
-                        $paginator = $livewire->getTableRecords();
-                        $perPage = method_exists($paginator, 'perPage') ? $paginator->perPage() : 10;
-                        $currentPage = method_exists($paginator, 'currentPage') ? $paginator->currentPage() : 1;
-
-                        return ($currentPage - 1) * $perPage + $rowLoop->iteration;
-                    }),
-                Tables\Columns\TextColumn::make('stockDataMaster.plant.name')
-                    ->label('Plant Name')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('stockDataMaster.stickerMaster.item.code')
-                    ->label('Item Code')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('stockDataMaster.location')
-                    ->label('Location')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('stockDataMaster.bin')
-                    ->label('Bin')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('stockDataMaster.serial_number')
-                    ->label('Serial Number')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('stockDataMaster.batch')
-                    ->label('Batch')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('stockDataMaster.quantity')
-                    ->label('Quantity')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('stockDataMaster.doc_no')
-                    ->label('Document Number')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('stockDataMaster.type')
-                    ->label('Type')
-                    ->alignCenter()
-                    ->searchable()
-                    ->formatStateUsing(fn ($state) => match ($state) {
-                        '0' => 'FG',
-                        '1' => 'NON-FG',
-                        default => '-',
-                    })
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('stockDataMaster.motor_scanned_status')
-                    ->label('Motor Scanned Status')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('stockDataMaster.pump_scanned_status')
-                    ->label('Pump Scanned Status')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('stockDataMaster.capacitor_scanned_status')
-                    ->label('Capacitor Scanned Status')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('stockDataMaster.scanned_status_set')
-                    ->label('Scanned Status Set')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('stockDataMaster.scanned_status')
-                    ->label('Scanned Status')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('created_at')
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-                Tables\Columns\TextColumn::make('updated_at')
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-                Tables\Columns\TextColumn::make('deleted_at')
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-            ])
-            ->filters([
-                Tables\Filters\TrashedFilter::make(),
-            ])
-            ->actions([
-                Tables\Actions\ViewAction::make(),
-                Tables\Actions\EditAction::make(),
-            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make(),
-                    Tables\Actions\ForceDeleteBulkAction::make(),
-                    Tables\Actions\RestoreBulkAction::make(),
-                ]),
-            ]);
-    }
-
-    public static function getRelations(): array
-    {
-        return [
-            //
-        ];
-    }
-
-    public static function getPages(): array
-    {
-        return [
-            'index' => Pages\ListDuplicateStocks::route('/'),
-            'create' => Pages\CreateDuplicateStock::route('/create'),
-            'view' => Pages\ViewDuplicateStock::route('/{record}'),
-            'edit' => Pages\EditDuplicateStock::route('/{record}/edit'),
-        ];
-    }
-
-    public static function getEloquentQuery(): Builder
-    {
-        return parent::getEloquentQuery()
-            ->withoutGlobalScopes([
-                SoftDeletingScope::class,
-            ]);
-    }
-}

app/Filament/Resources/DuplicateStockResource/Pages/CreateDuplicateStock.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\DuplicateStockResource\Pages;
-
-use App\Filament\Resources\DuplicateStockResource;
-use Filament\Actions;
-use Filament\Resources\Pages\CreateRecord;
-
-class CreateDuplicateStock extends CreateRecord
-{
-    protected static string $resource = DuplicateStockResource::class;
-}

app/Filament/Resources/DuplicateStockResource/Pages/EditDuplicateStock.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\DuplicateStockResource\Pages;
-
-use App\Filament\Resources\DuplicateStockResource;
-use Filament\Actions;
-use Filament\Resources\Pages\EditRecord;
-
-class EditDuplicateStock extends EditRecord
-{
-    protected static string $resource = DuplicateStockResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\ViewAction::make(),
-            Actions\DeleteAction::make(),
-            Actions\ForceDeleteAction::make(),
-            Actions\RestoreAction::make(),
-        ];
-    }
-}

app/Filament/Resources/DuplicateStockResource/Pages/ListDuplicateStocks.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\DuplicateStockResource\Pages;
-
-use App\Filament\Resources\DuplicateStockResource;
-use Filament\Actions;
-use Filament\Resources\Pages\ListRecords;
-
-class ListDuplicateStocks extends ListRecords
-{
-    protected static string $resource = DuplicateStockResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\CreateAction::make(),
-        ];
-    }
-}

app/Filament/Resources/DuplicateStockResource/Pages/ViewDuplicateStock.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\DuplicateStockResource\Pages;
-
-use App\Filament\Resources\DuplicateStockResource;
-use Filament\Actions;
-use Filament\Resources\Pages\ViewRecord;
-
-class ViewDuplicateStock extends ViewRecord
-{
-    protected static string $resource = DuplicateStockResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\EditAction::make(),
-        ];
-    }
-}

app/Filament/Resources/ItemResource.php

@@ -48,12 +48,10 @@ class ItemResource extends Resource
                 Section::make('')
                     ->schema([
                         Forms\Components\Select::make('plant_id')
-                            ->label('Plant Name')
                             ->relationship('plant', 'name')
                             ->required()
                         // ->preload()
                         // ->nullable(),
-                            ->searchable()
                             ->reactive()
                             ->options(function (callable $get) {
                                 $userHas = Filament::auth()->user()->plant_id;
@@ -193,7 +191,7 @@ class ItemResource extends Resource
                         return ($currentPage - 1) * $perPage + $rowLoop->iteration;
                     }),
                 Tables\Columns\TextColumn::make('plant.name')
-                    ->label('Plant Name')
+                    ->label('Plant')
                     ->alignCenter()
                     ->sortable()
                     ->searchable(),
@@ -232,7 +230,8 @@ class ItemResource extends Resource
                     ->label('Updated At')
                     ->dateTime()
                     ->alignCenter()
-                    ->sortable(),
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true),
                 Tables\Columns\TextColumn::make('deleted_at')
                     ->label('Deleted At')
                     ->dateTime()
@@ -247,21 +246,13 @@ class ItemResource extends Resource
                     ->label('Advanced Filters')
                     ->form([
                         Select::make('Plant')
-                            ->label('Search by Plant Name')
+                            ->label('Select Plant')
                             ->nullable()
                             ->options(function (callable $get) {
                                 $userHas = Filament::auth()->user()->plant_id;
 
-                                // return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::orderBy('code')->pluck('name', 'id')->toArray();
-                                if ($userHas && strlen($userHas) > 0) {
-                                    return Plant::where('id', $userHas)->pluck('name', 'id')->toArray();
-                                } else {
-                                    return Plant::whereHas('items', function ($query) {
-                                        $query->whereNotNull('id');
-                                    })->orderBy('code')->pluck('name', 'id')->toArray();
-                                }
+                                return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::orderBy('code')->pluck('name', 'id')->toArray();
                             })
-                            ->searchable()
                             ->reactive()
                             ->afterStateUpdated(function ($state, callable $set, callable $get): void {
                                 $set('code', null);
@@ -328,24 +319,12 @@ class ItemResource extends Resource
                         }
 
                         if (! empty($data['uom'])) {
-                            if ($data['uom'] == 'empty') {
-                                $query->where(function ($q) {
-                                    $q->where('uom', '')->orWhereNull('uom');
-                                });
-                            } else {
                             $query->where('uom', 'like', '%'.$data['uom'].'%');
                         }
-                        }
 
                         if (! empty($data['category'])) {
-                            if ($data['category'] == 'empty') {
-                                $query->where(function ($q) {
-                                    $q->where('category', '')->orWhereNull('category');
-                                });
-                            } else {
                             $query->where('category', '%'.$data['category'].'%');
                         }
-                        }
 
                         if (! empty($data['created_from'])) {
                             $query->where('created_at', '>=', $data['created_from']);
@@ -377,11 +356,11 @@ class ItemResource extends Resource
                         }
 
                         if (! empty($data['uom'])) {
-                            $indicators[] = ($data['uom'] == 'empty') ? "UOM: ''" : 'UOM: '.$data['uom'];
+                            $indicators[] = 'UOM: '.$data['uom'];
                         }
 
                         if (! empty($data['category'])) {
-                            $indicators[] = ($data['category'] == 'empty') ? "Category: ''" : 'Category: '.$data['category'];
+                            $indicators[] = 'Category: '.$data['category'];
                         }
 
                         if (! empty($data['created_from'])) {

app/Filament/Resources/NotInStockResource.php

@@ -1,284 +0,0 @@
-<?php
-
-namespace App\Filament\Resources;
-
-use App\Filament\Exports\NotInStockExporter;
-use App\Filament\Imports\NotInStockImporter;
-use App\Filament\Resources\NotInStockResource\Pages;
-use App\Models\NotInStock;
-use App\Models\StickerMaster;
-use Filament\Facades\Filament;
-use Filament\Forms;
-use Filament\Forms\Form;
-use Filament\Resources\Resource;
-use Filament\Tables;
-use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
-use Filament\Tables\Actions\ExportAction;
-use Filament\Tables\Actions\ImportAction;
-
-
-class NotInStockResource extends Resource
-{
-    protected static ?string $model = NotInStock::class;
-
-    protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
-
-    protected static ?string $navigationGroup = 'Cycle Count Software';
-
-    public static function form(Form $form): Form
-    {
-        return $form
-            ->schema([
-                Forms\Components\Select::make('plant_id')
-                    ->label('Plant')
-                    ->reactive()
-                    ->relationship('plant', 'name')
-                    ->required(),
-                Forms\Components\Select::make('sticker_master_id')
-                    ->label('Item Code')
-                    ->reactive()
-                    ->required()
-                    ->searchable()
-                    ->options(function ($get) {
-                        if (! $get('plant_id')) {
-                            return [];
-                        }
-
-                        return StickerMaster::with('item')
-                            ->where('plant_id', $get('plant_id'))
-                            ->get()
-                            ->pluck('item.code', 'id')
-                            ->toArray();
-                    }),
-                Forms\Components\TextInput::make('location')
-                    ->label('Location'),
-                Forms\Components\TextInput::make('bin')
-                    ->label('Bin'),
-                Forms\Components\TextInput::make('serial_number')
-                    ->label('Serial Number'),
-                Forms\Components\TextInput::make('batch')
-                    ->label('Batch'),
-                Forms\Components\TextInput::make('quantity')
-                    ->label('Quantity'),
-                Forms\Components\TextInput::make('doc_no')
-                    ->label('Doc No'),
-                Forms\Components\Select::make('type')
-                    ->label('Type')
-                    ->options([
-                        '0' => 'FG',
-                        '1' => 'NON-FG',
-                    ]),
-                Forms\Components\TextInput::make('motor_scanned_status')
-                    ->label('Motor Scanned Status'),
-                Forms\Components\TextInput::make('pump_scanned_status')
-                    ->label('Pump Scanned Status'),
-                Forms\Components\TextInput::make('capacitor_scanned_status')
-                    ->label('Capacitor Scanned Status'),
-                Forms\Components\TextInput::make('scanned_status_set')
-                    ->label('Scanned Status Set'),
-                Forms\Components\TextInput::make('panel_box_item_code')
-                    ->label('Panel Box Item Code'),
-                Forms\Components\TextInput::make('panel_box_supplier')
-                    ->label('Panel Box Supplier'),
-                Forms\Components\TextInput::make('panel_box_sno')
-                    ->label('Panel Box Sno'),
-                Forms\Components\TextInput::make('scanned_status')
-                    ->label('Scanned Status'),
-                Forms\Components\TextInput::make('scanned_quantity')
-                    ->label('Scanned Quantity'),
-                Forms\Components\Hidden::make('created_by')
-                    ->label('Created By')
-                    ->default(Filament::auth()->user()?->name),
-                Forms\Components\Hidden::make('updated_by')
-                    ->label('Updated By')
-                    ->default(Filament::auth()->user()?->name),
-            ]);
-    }
-
-    public static function table(Table $table): Table
-    {
-        return $table
-            ->columns([
-                Tables\Columns\TextColumn::make('No.')
-                    ->label('No.')
-                    ->getStateUsing(function ($record, $livewire, $column, $rowLoop) {
-                        $paginator = $livewire->getTableRecords();
-                        $perPage = method_exists($paginator, 'perPage') ? $paginator->perPage() : 10;
-                        $currentPage = method_exists($paginator, 'currentPage') ? $paginator->currentPage() : 1;
-
-                        return ($currentPage - 1) * $perPage + $rowLoop->iteration;
-                    }),
-                Tables\Columns\TextColumn::make('plant.name')
-                    ->label('Plant')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('stickerMaster.item.code')
-                    ->label('Item Code')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('type')
-                    ->label('Type')
-                    ->alignCenter()
-                    ->searchable()
-                    ->formatStateUsing(fn ($state) => match ($state) {
-                        '0' => 'FG',
-                        '1' => 'NON-FG',
-                        default => '-',
-                    })
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('location')
-                    ->label('Location')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('bin')
-                    ->label('Bin')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('serial_number')
-                    ->label('Serial Number')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('batch')
-                    ->label('Batch')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('quantity')
-                    ->label('Quantity')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('doc_no')
-                    ->label('Document Number')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('motor_scanned_status')
-                    ->label('Motor Scanned Status')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('pump_scanned_status')
-                    ->label('Pump Scanned Status')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('capacitor_scanned_status')
-                    ->label('Capacitor Scanned Status')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('scanned_status_set')
-                    ->label('Scanned Status Set')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('panel_box_item_code')
-                    ->label('Panel Box Item Code')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('panel_box_supplier')
-                    ->label('Panel Box Supplier')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('panel_box_sno')
-                    ->label('Panel Box Serial Number')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('scanned_status')
-                    ->label('Scanned Status')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('scanned_quantity')
-                    ->label('Scanned Quantity')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('created_at')
-                    ->label('Created At')
-                    ->alignCenter()
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-                Tables\Columns\TextColumn::make('updated_at')
-                    ->label('Updated At')
-                    ->alignCenter()
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-                Tables\Columns\TextColumn::make('deleted_at')
-                    ->label('Deleted At')
-                    ->alignCenter()
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-            ])
-            ->filters([
-                Tables\Filters\TrashedFilter::make(),
-            ])
-            ->actions([
-                Tables\Actions\ViewAction::make(),
-                Tables\Actions\EditAction::make(),
-            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make(),
-                    Tables\Actions\ForceDeleteBulkAction::make(),
-                    Tables\Actions\RestoreBulkAction::make(),
-                ]),
-            ])
-            ->headerActions([
-                ImportAction::make()
-                    ->label('Import Not In Stock')
-                    ->color('warning')
-                    ->importer(NotInStockImporter::class)
-                    ->visible(function () {
-                        return Filament::auth()->user()->can('view import not in stock');
-                    }),
-                ExportAction::make()
-                    ->label('Export Not In Stock')
-                    ->color('warning')
-                    ->exporter(NotInStockExporter::class)
-                    ->visible(function () {
-                        return Filament::auth()->user()->can('view export not in stock');
-                    }),
-            ]);
-    }
-
-    public static function getRelations(): array
-    {
-        return [
-            //
-        ];
-    }
-
-    public static function getPages(): array
-    {
-        return [
-            'index' => Pages\ListNotInStocks::route('/'),
-            'create' => Pages\CreateNotInStock::route('/create'),
-            'view' => Pages\ViewNotInStock::route('/{record}'),
-            'edit' => Pages\EditNotInStock::route('/{record}/edit'),
-        ];
-    }
-
-
-    public static function getEloquentQuery(): Builder
-    {
-        return parent::getEloquentQuery()
-            ->withoutGlobalScopes([
-                SoftDeletingScope::class,
-            ]);
-    }
-}

app/Filament/Resources/NotInStockResource/Pages/CreateNotInStock.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\NotInStockResource\Pages;
-
-use App\Filament\Resources\NotInStockResource;
-use Filament\Actions;
-use Filament\Resources\Pages\CreateRecord;
-
-class CreateNotInStock extends CreateRecord
-{
-    protected static string $resource = NotInStockResource::class;
-}

app/Filament/Resources/NotInStockResource/Pages/EditNotInStock.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\NotInStockResource\Pages;
-
-use App\Filament\Resources\NotInStockResource;
-use Filament\Actions;
-use Filament\Resources\Pages\EditRecord;
-
-class EditNotInStock extends EditRecord
-{
-    protected static string $resource = NotInStockResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\ViewAction::make(),
-            Actions\DeleteAction::make(),
-            Actions\ForceDeleteAction::make(),
-            Actions\RestoreAction::make(),
-        ];
-    }
-}

app/Filament/Resources/NotInStockResource/Pages/ListNotInStocks.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\NotInStockResource\Pages;
-
-use App\Filament\Resources\NotInStockResource;
-use Filament\Actions;
-use Filament\Resources\Pages\ListRecords;
-
-class ListNotInStocks extends ListRecords
-{
-    protected static string $resource = NotInStockResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\CreateAction::make(),
-        ];
-    }
-}

app/Filament/Resources/NotInStockResource/Pages/ViewNotInStock.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\NotInStockResource\Pages;
-
-use App\Filament\Resources\NotInStockResource;
-use Filament\Actions;
-use Filament\Resources\Pages\ViewRecord;
-
-class ViewNotInStock extends ViewRecord
-{
-    protected static string $resource = NotInStockResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\EditAction::make(),
-        ];
-    }
-}

app/Filament/Resources/ProcessOrderResource.php

@@ -9,7 +9,6 @@ use App\Models\Item;
 use App\Models\Line;
 use App\Models\Plant;
 use App\Models\ProcessOrder;
-use App\Models\ProductCharacteristicsMaster;
 use Closure;
 use Filament\Facades\Filament;
 use Filament\Forms;
@@ -75,7 +74,6 @@ class ProcessOrderResource extends Resource
                         $set('process_order', null);
                         $set('coil_number', '0');
                         $set('order_quantity', '0');
-                        $set('updated_order_quantity', '0');
                         $set('received_quantity', '0');
                         $set('scrap_quantity', '0');
                         $set('sfg_number', null);
@@ -115,7 +113,6 @@ class ProcessOrderResource extends Resource
                         $set('process_order', null);
                         $set('coil_number', '0');
                         $set('order_quantity', '0');
-                        $set('updated_order_quantity', '0');
                         $set('received_quantity', '0');
                         $set('scrap_quantity', '0');
                         $set('sfg_number', null);
@@ -131,14 +128,10 @@ class ProcessOrderResource extends Resource
                     ->reactive()
                     ->options(function (callable $get) {
                         $plantId = $get('plant_id');
-                        // $lineId = $get('line_id');
-                        if (empty($plantId)) {// || empty($lineId)
+                        if (empty($plantId)) {
                             return [];
                         }
 
-                        // $availItems = ProductCharacteristicsMaster::where('plant_id', $plantId)->where('line_id', $lineId)->pluck('item_id', 'item_id')->toArray();
-
-                        // return Item::where('plant_id', $plantId)->whereIn('id', $availItems)->pluck('code', 'id');
                         return Item::where('plant_id', $plantId)->pluck('code', 'id');
                     })
                     ->disabled(fn (Get $get) => ! empty($get('id')))
@@ -148,7 +141,6 @@ class ProcessOrderResource extends Resource
                         $set('process_order', null);
                         $set('coil_number', '0');
                         $set('order_quantity', '0');
-                        $set('updated_order_quantity', '0');
                         $set('received_quantity', '0');
                         $set('scrap_quantity', '0');
                         $set('sfg_number', null);
@@ -225,7 +217,6 @@ class ProcessOrderResource extends Resource
                         $plantId = $get('plant_id');
                         $set('coil_number', '0');
                         $set('order_quantity', '0');
-                        $set('updated_order_quantity', '0');
                         $set('received_quantity', '0');
                         $set('scrap_quantity', '0');
                         $set('sfg_number', null);
@@ -289,10 +280,10 @@ class ProcessOrderResource extends Resource
                     ->required()
                     ->reactive()
                     ->numeric()
-                    ->readOnly(fn ($get) => (trim($get('process_order')) == null || trim($get('process_order')) == ''))
+                    ->readOnly(fn ($get) => ($get('process_order') == null))
                     ->afterStateUpdated(function ($state, $set, callable $get, $livewire) {
                         $plantId = $get('plant_id');
-                        $processOrder = trim($get('process_order'));
+                        $processOrder = $get('process_order');
                         // $coilNo = $get('coil_number');
                         if (! $plantId) {
                             $set('poPlantError', 'Please select a plant first.');
@@ -328,37 +319,22 @@ class ProcessOrderResource extends Resource
                         function (callable $get) {
                             return Rule::unique('process_orders', 'coil_number')
                                 ->where('plant_id', $get('plant_id'))
-                                ->where('process_order', trim($get('process_order')))
+                                ->where('process_order', $get('process_order'))
                                 ->ignore($get('id'));
                         },
                         function (callable $get): Closure {
                             return function (string $attribute, $value, Closure $fail) use ($get) {
                                 $rework = $get('rework_status');
-                                $plantId = $get('plant_id');
-                                $processOrder = trim($get('process_order'));
-
-                                if ($value && Str::contains($value, '.')) {
-                                    if ($rework == 0) {
+                                if ($value && Str::contains($value, '.') && $rework == 0) {
                                     $fail("Rework status should be 'Yes' for rework coil number '{$value}'!");
                                 }
-                                } elseif ($value > 1) {
-                                    $prevCoilNo = (string) ($value - 1);
-                                    $existPrevCoil = ProcessOrder::where('plant_id', $plantId)
-                                        ->where('process_order', $processOrder)
-                                        ->where('coil_number', $prevCoilNo)
-                                        ->first();
-
-                                    if (! $existPrevCoil) {
-                                        $fail("Previous coil number '{$prevCoilNo}' not exist against plant and process order!");
-                                    }
-                                }
                             };
                         },
                     ])
                     // ->rule(function (callable $get) {
                     //     return Rule::unique('process_orders', 'coil_number')
                     //         ->where('plant_id', $get('plant_id'))
-                    //         ->where('process_order', trim($get('process_order')))
+                    //         ->where('process_order', $get('process_order'))
                     //         ->ignore($get('id'));
                     // })
                     ->extraAttributes(fn ($get) => [
@@ -372,17 +348,15 @@ class ProcessOrderResource extends Resource
                     ->required()
                     ->reactive()
                     ->numeric()
-                    ->readOnly(fn ($get) => (trim($get('process_order')) == null || trim($get('process_order')) == ''))
+                    ->readOnly(fn ($get) => ($get('process_order') == null))
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $plantId = $get('plant_id');
                         $itemId = $get('item_id');
                         $processOrder = trim($get('process_order'));
                         $set('received_quantity', '0');
-                        // $set('updated_order_quantity', $state);
                         $set('scrap_quantity', '0');
                         if (! $plantId || ! $itemId || ! $processOrder) {
                             $set('order_quantity', '0');
-                            $set('updated_order_quantity', '0');
                         }
 
                         $query = ProcessOrder::where('plant_id', $plantId)
@@ -398,175 +372,13 @@ class ProcessOrderResource extends Resource
                         }
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
-                Forms\Components\TextInput::make('updated_order_quantity')
-                    ->label('Updated Order Quantity')
-                    ->required()
-                    ->readOnly(fn ($get) => (trim($get('process_order')) == null || trim($get('process_order')) == '' || trim($get('order_quantity')) == '' || trim($get('order_quantity')) == null))
-                    ->reactive()
-                    ->rules([
-                        function (callable $get): Closure {
-                            return function (string $attribute, $value, Closure $fail) use ($get) {
-                                $plantId = $get('plant_id');
-                                $processOrder = trim($get('process_order'));
-                                $receivedQty = $get('received_quantity');
-
-                                $currentId = $get('id');
-
-                                $orderQty = (float) $get('order_quantity');
-                                $updatedQty = (float) $value;
-
-                                $allowedVariance = $orderQty * 0.10;
-
-                                $maxAllowed = $orderQty + $allowedVariance;
-                                $minAllowed = $orderQty - $allowedVariance;
-
-                                if ($updatedQty > $maxAllowed || $updatedQty < $minAllowed) {
-                                    $fail('Quantity can vary by ±10% of the order quantity.');
-                                }
-
-                                $otherReceivedQty = ProcessOrder::where('plant_id', $plantId)
-                                    ->where('process_order', $processOrder)
-                                    ->when($currentId, fn ($q) => $q->where('id', '!=', $currentId))
-                                    ->sum('received_quantity');
-
-                                $currentReceivedQty = (float) $get('received_quantity');
-
-                                $totalReceivedQty = $otherReceivedQty + $currentReceivedQty;
-
-                                if ($updatedQty < $totalReceivedQty) {
-                                    $fail("You cannot set quantity below received quantity ({$totalReceivedQty}).");
-                                }
-                            };
-                        },
-                    ]),
                 Forms\Components\TextInput::make('received_quantity')
                     ->label('Received Quantity')
                     ->default('0.000')
                     ->required()
                     ->reactive()
                     ->numeric()
-                    ->maxValue(fn (Get $get) => $get('order_quantity') ?? PHP_INT_MAX)
-                    ->readOnly(fn ($get) => (trim($get('process_order')) == null || trim($get('process_order')) == ''))
-                    ->rule(function (callable $get) {
-                        return function (string $attribute, $value, Closure $fail) use ($get) {
-                            $rework = $get('rework_status');
-                            $plantId = $get('plant_id');
-                            $lineId = $get('line_id');
-                            $itemId = $get('item_id');
-                            $processOrder = trim($get('process_order'));
-                            $coilNo = trim($get('coil_number'));
-
-                            $orderExist = ProcessOrder::where('plant_id', $plantId)
-                                ->where('process_order', $processOrder)
-                                ->where('item_id', $itemId)->latest()->first();
-
-                            if ($orderExist) {
-                                // $orderQty = $orderExist->order_quantity ?? 0;
-                                $orderQty = $orderExist->updated_order_quantity ?? 0;
-
-                                $alreadyReceived = ProcessOrder::where('plant_id', $plantId)
-                                    ->where('process_order', $processOrder)
-                                    ->where('item_id', $itemId)
-                                    ->sum('received_quantity');
-
-                                $total = $alreadyReceived + $value;
-
-                                if ($rework == 1) {
-                                    if ($coilNo && Str::contains($coilNo, '.')) {
-                                        $coilMain = explode('.', $coilNo)[0];
-
-                                        $existingCoil = ProcessOrder::where('plant_id', $plantId)
-                                            ->where('process_order', $processOrder)
-                                            ->where('line_id', $lineId)
-                                            ->where('coil_number', $coilMain)
-                                            ->first();
-
-                                        $existPrevCoil = ProcessOrder::where('plant_id', $plantId)
-                                            ->where('process_order', $processOrder)
-                                            ->where('item_id', $itemId)
-                                            ->where('coil_number', $coilNo)
-                                            ->first();
-
-                                        if ($existPrevCoil && $existPrevCoil->received_quantity < $value) {
-                                            $fail('Rework received quantity should not exceed exist received quantity!');
-
-                                            return;
-                                        }
-
-                                        if ($existingCoil && $existingCoil->rework_status == 1 && $total > $orderQty) {
-                                            $fail("Rework received quantity should not exceed exist order quantity! Already Exist Total Received Qty = '{$alreadyReceived}'.");
-                                        }
-                                    } else {
-                                        if ($coilNo > 1) {
-                                            $prevCoilNo = (string) ($coilNo - 1);
-                                            $existPrevCoil = ProcessOrder::where('plant_id', $plantId)
-                                                ->where('process_order', $processOrder)
-                                                ->where('coil_number', $prevCoilNo)
-                                                ->first();
-
-                                            if (! $existPrevCoil) {
-                                                return;
-                                            }
-                                        }
-
-                                        $existingCoil = ProcessOrder::where('plant_id', $plantId)
-                                            ->where('process_order', $processOrder)
-                                            ->where('line_id', $lineId)
-                                            ->where('coil_number', $coilNo)
-                                            ->first();
-
-                                        if (! $existingCoil) {
-                                            return;
-                                        }
-
-                                        $existPrevCoil = ProcessOrder::where('plant_id', $plantId)
-                                            ->where('process_order', $processOrder)
-                                            ->where('item_id', $itemId)
-                                            ->where('coil_number', $coilNo)
-                                            ->first();
-
-                                        if ($existPrevCoil && $existPrevCoil->received_quantity < $value) {
-                                            $fail('Rework received quantity should not exceed exist received quantity!');
-
-                                            return;
-                                        }
-                                    }
-                                } else {
-                                    if ($coilNo && Str::contains($coilNo, '.')) {
-                                        return;
-                                    }
-
-                                    $existing = ProcessOrder::where('plant_id', $plantId)
-                                        ->where('process_order', $processOrder)
-                                        ->where('coil_number', $coilNo)
-                                        ->first();
-                                    if ($existing) {
-                                        if ($existing->received_quantity < $value) {
-                                            $fail('Received quantity should not exceed exist received quantity!'); // Exist Received Qty = '{$existing->received_quantity}'.
-                                        }
-
-                                        return;
-                                    }
-
-                                    if ($coilNo > 1) {
-                                        $prevCoilNo = (string) ($coilNo - 1);
-                                        $existPrevCoil = ProcessOrder::where('plant_id', $plantId)
-                                            ->where('process_order', $processOrder)
-                                            ->where('coil_number', $prevCoilNo)
-                                            ->first();
-
-                                        if (! $existPrevCoil) {
-                                            return;
-                                        }
-                                    }
-
-                                    if ($total > $orderQty) {
-                                        $fail("Received quantity should not exceed exist order quantity! Already Exist Total Received Qty = '{$alreadyReceived}'.");
-                                    }
-                                }
-                            }
-                        };
-                    })
+                    ->readOnly(fn ($get) => ($get('process_order') == null))
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('scrap_quantity', '0');
                         $set('updated_by', Filament::auth()->user()?->name);
@@ -575,7 +387,7 @@ class ProcessOrderResource extends Resource
                     ->label('Scrap Quantity')
                     ->default('0.000')
                     ->required()
-                    ->readOnly(fn ($get) => ($get('rework_status') == 0 || trim($get('process_order')) == null || trim($get('process_order')) == ''))
+                    ->readOnly(fn ($get) => ($get('rework_status') == 0 || $get('process_order') == null))
                     ->reactive()
                     ->numeric()
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
@@ -602,7 +414,7 @@ class ProcessOrderResource extends Resource
                 Forms\Components\TextInput::make('sfg_number')
                     ->label('SFG Number')
                     ->reactive()
-                    ->readOnly(fn ($get) => (trim($get('process_order')) == null || trim($get('process_order')) == ''))
+                    ->readOnly(fn ($get) => ($get('process_order') == null))
                     ->afterStateUpdated(function ($state, $set, callable $get, $livewire) {
                         $plantId = $get('plant_id');
                         $sfgNo = $get('sfg_number');
@@ -636,8 +448,7 @@ class ProcessOrderResource extends Resource
                 Forms\Components\TextInput::make('machine_name')
                     ->label('Machine Name')
                     ->reactive()
-                    ->maxLength(18)
-                    ->readOnly(fn ($get) => (trim($get('process_order')) == null || trim($get('process_order')) == ''))
+                    ->readOnly(fn ($get) => ($get('process_order') == null))
                     ->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
                         $set('updated_by', Filament::auth()->user()?->name);
                     }),
@@ -765,7 +576,7 @@ class ProcessOrderResource extends Resource
                                     }
 
                                     // Get the value of process_order field
-                                    $processOrder = trim($get('process_order'));
+                                    $processOrder = $get('process_order');
 
                                     if ($batchId != $processOrder) {
                                         Notification::make()
@@ -810,7 +621,7 @@ class ProcessOrderResource extends Resource
                             return Filament::auth()->user()->can('view process order packing slip');
                         })
                         ->action(function ($get, callable $set) {
-                            $equipmentNumber = trim($get('process_order'));
+                            $equipmentNumber = $get('process_order');
                             $set('updated_by', Filament::auth()->user()?->name);
 
                             if (! $equipmentNumber) {
@@ -909,11 +720,6 @@ class ProcessOrderResource extends Resource
                     ->alignCenter()
                     ->searchable()
                     ->sortable(),
-                Tables\Columns\TextColumn::make('updated_order_quantity')
-                    ->label('Updated Order Quantity')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
                 Tables\Columns\TextColumn::make('received_quantity')
                     ->label('Received Quantity')
                     ->alignCenter()
@@ -1258,7 +1064,7 @@ class ProcessOrderResource extends Resource
                                     ->options(function (callable $get) {
                                         $plantId = $get('plant');
                                         $itemId = $get('Item');
-                                        $processOrder = trim($get('process_order'));
+                                        $processOrder = $get('process_order');
 
                                         if (empty($plantId) || empty($itemId) || empty($processOrder)) {
                                             return [];
@@ -1275,7 +1081,7 @@ class ProcessOrderResource extends Resource
                                     ->afterStateUpdated(function ($state, callable $set, callable $get) {
                                         $plantId = $get('plant');
                                         $itemId = $get('Item');
-                                        $processOrder = trim($get('process_order'));
+                                        $processOrder = $get('process_order');
 
                                         if (! $plantId || ! $itemId || ! $processOrder || ! $state) {
                                             $set('received_quantity', null);

app/Filament/Resources/ProcessOrderResource/Pages/CreateProcessOrder.php

@@ -3,28 +3,10 @@
 namespace App\Filament\Resources\ProcessOrderResource\Pages;
 
 use App\Filament\Resources\ProcessOrderResource;
-use App\Models\ProcessOrder;
 use Filament\Actions;
-use Filament\Facades\Filament;
-use Filament\Notifications\Notification;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateProcessOrder extends CreateRecord
 {
     protected static string $resource = ProcessOrderResource::class;
-
-    protected function afterCreate(): void
-    {
-        $plantId = $this->data['plant_id'];
-        $processOrder = $this->data['process_order'];
-        $updatedQty = (float) $this->data['updated_order_quantity'];
-
-        ProcessOrder::where('plant_id', $plantId)
-            ->where('process_order', $processOrder)
-            ->update([
-                'updated_order_quantity' => $updatedQty,
-                'updated_by' => Filament::auth()->user()->name,
-            ]);
-    }
-
 }

app/Filament/Resources/ProcessOrderResource/Pages/EditProcessOrder.php

@@ -3,78 +3,13 @@
 namespace App\Filament\Resources\ProcessOrderResource\Pages;
 
 use App\Filament\Resources\ProcessOrderResource;
-use App\Models\ProcessOrder;
 use Filament\Actions;
-use Filament\Facades\Filament;
-use Filament\Notifications\Notification;
 use Filament\Resources\Pages\EditRecord;
 
 class EditProcessOrder extends EditRecord
 {
     protected static string $resource = ProcessOrderResource::class;
 
-    protected function beforeSave(): void
-    {
-        $plantId = $this->data['plant_id'] ?? null;
-        $processOrder = $this->data['process_order'] ?? null;
-        $extraQty = (float) ($this->data['updated_order_quantity'] ?? 0);
-        $extraQtyRaw = $this->data['updated_order_quantity'] ?? '';
-
-        if (!preg_match('/^\d+(\.\d{1,3})?$/', $extraQtyRaw)) {
-            Notification::make()
-                ->title('Invalid Quantity')
-                ->body('Only positive numbers with up to 3 decimal places are allowed.')
-                ->danger()
-                ->send();
-
-            $this->halt(); // stop save
-        }
-
-        if ($extraQty < 0)
-        {
-            Notification::make()
-                ->title('Invalid Quantity')
-                ->body('Negative values are not allowed.')
-                ->danger()
-                ->send();
-
-            $this->halt();
-        }
-
-        if ($extraQty > 0) {
-
-            $order = ProcessOrder::where('plant_id', $plantId)
-                ->where('process_order', $processOrder)
-                ->first();
-
-            if ($order) {
-
-                $baseQty = (float) $order->order_quantity;
-                $maxAllowed = $baseQty * 0.10;
-
-                $maxFinalQty = $baseQty + $maxAllowed;
-
-                if ($extraQty > $maxFinalQty) {
-                    Notification::make()
-                        ->title('Limit Exceeded')
-                        ->body("You can only increase the order by 10% (Max allowed: {$maxFinalQty}).")
-                        ->danger()
-                        ->send();
-
-                    $this->halt(); // stops save
-                }
-
-                ProcessOrder::where('plant_id', $plantId)
-                    ->where('process_order', $processOrder)
-                    ->update([
-                        'updated_order_quantity' => $extraQty,
-                        'updated_by' => Filament::auth()->user()?->name,
-                    ]);
-            }
-        }
-    }
-
-
     protected function getHeaderActions(): array
     {
         return [

app/Filament/Resources/ProductCharacteristicsMasterResource.php

@@ -59,10 +59,6 @@ class ProductCharacteristicsMasterResource extends Resource
                     })
                     ->afterStateUpdated(function ($state, callable $set) {
                         $set('updated_by', Filament::auth()->user()?->name);
-                        $set('item_id', null);
-                        $set('line_id', null);
-                        $set('work_group_master_id', null);
-                        $set('machine_id', null);
                     })
                     ->reactive()
                     ->required(),
@@ -82,9 +78,6 @@ class ProductCharacteristicsMasterResource extends Resource
                     ->disabled(fn (Get $get) => ! empty($get('id')))
                     ->afterStateUpdated(function ($state, callable $set) {
                         $set('updated_by', Filament::auth()->user()?->name);
-                        $set('line_id', null);
-                        $set('work_group_master_id', null);
-                        $set('machine_id', null);
                     })
                     ->rules([
                         function (callable $get) {
@@ -119,14 +112,16 @@ class ProductCharacteristicsMasterResource extends Resource
 
                         return Line::where('plant_id', $plantId)->pluck('name', 'id');
                     })
-                    // ->disabled(fn (Get $get) => ! empty($get('id')))
+                    ->disabled(fn (Get $get) => ! empty($get('id')))
                     ->afterStateUpdated(function ($state, callable $set, callable $get) {
-                        $set('updated_by', Filament::auth()->user()?->name);
-                        $set('work_group_master_id', null);
                         $set('machine_id', null);
+                        if (! $get('work_group_master_id')) {
+                            $set('machine_id', null);
+                        }
+                        $set('updated_by', Filament::auth()->user()?->name);
                     })
-                    // ->relationship('line', 'name'),
                     ->required(),
+                // ->relationship('line', 'name'),
                 Forms\Components\Select::make('work_group_master_id')
                     ->label('Group Work Center')
                     ->required()
@@ -148,13 +143,13 @@ class ProductCharacteristicsMasterResource extends Resource
 
                         return WorkGroupMaster::where('plant_id', $get('plant_id'))->whereIn('id', $workGroupIds)->pluck('name', 'id')->toArray();
                     })
-                    // ->disabled(fn (Get $get) => ! empty($get('id')))
+                    ->disabled(fn (Get $get) => ! empty($get('id')))
                     ->afterStateUpdated(function ($state, callable $set, callable $get) {
                         $lineId = $get('line_id');
                         $set('updated_by', Filament::auth()->user()?->name);
-                        $set('machine_id', null);
                         if (! $lineId) {
                             $set('mGroupWorkError', 'Please select a line first.');
+                            $set('machine_id', null);
 
                             return;
                         } else {
@@ -166,6 +161,7 @@ class ProductCharacteristicsMasterResource extends Resource
                             //     return;
                             // }
                             $set('mGroupWorkError', null);
+                            $set('machine_id', null);
                         }
                     })
                     ->extraAttributes(fn ($get) => [
@@ -193,7 +189,7 @@ class ProductCharacteristicsMasterResource extends Resource
                             ->where('work_group_master_id', $workGroupId)
                             ->pluck('work_center', 'id');
                     })
-                    // ->disabled(fn (Get $get) => ! empty($get('id')))
+                    ->disabled(fn (Get $get) => ! empty($get('id')))
                     ->afterStateUpdated(function ($state, callable $set, callable $get) {
                         if (! $get('plant_id') || ! $get('line_id') || ! $get('work_group_master_id')) {
                             $set('machine_id', null);
@@ -240,7 +236,6 @@ class ProductCharacteristicsMasterResource extends Resource
                         $set('updated_by', Filament::auth()->user()?->name);
                     })
                     ->required(),
-
                 // Forms\Components\Select::make('result')
                 //     ->label('Visual Type')
                 //     ->reactive()
@@ -258,7 +253,6 @@ class ProductCharacteristicsMasterResource extends Resource
                 //         session()->put('temp_result', $state);
                 //     })
                 //     ->hidden(fn (callable $get) => $get('inspection_type') != 'Visual'),
-
                 Forms\Components\TextInput::make('lower')
                     ->label('Lower')
                     ->numeric()

app/Filament/Resources/StickerMasterResource.php

@@ -49,9 +49,7 @@ class StickerMasterResource extends Resource
         return $form
             ->schema([
                 Forms\Components\Select::make('plant_id')
-                    ->label('Plant Name')
                     ->relationship('plant', 'name')
-                    ->searchable()
                     ->reactive()
                     ->nullable()
                     ->options(function (callable $get) {
@@ -190,7 +188,7 @@ class StickerMasterResource extends Resource
                     ->hintColor('danger'),
 
                 Forms\Components\TextInput::make('item_description')
-                    ->label('Item Description')
+                    ->label('Description')
                     ->required()
                     ->afterStateHydrated(function ($component, $state, Get $get, Set $set) {
                         if ($get('id')) {
@@ -531,7 +529,7 @@ class StickerMasterResource extends Resource
                         return ($currentPage - 1) * $perPage + $rowLoop->iteration;
                     }),
                 Tables\Columns\TextColumn::make('plant.name')
-                    ->label('Plant Name')
+                    ->label('Plant')
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('item.code')
@@ -539,19 +537,6 @@ class StickerMasterResource extends Resource
                     ->alignCenter()
                     ->sortable()
                     ->searchable(),
-                Tables\Columns\TextColumn::make('item.description')
-                    ->label('Item Description')
-                    ->alignCenter()
-                    ->sortable()
-                    ->searchable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-                Tables\Columns\TextColumn::make('item.uom')
-                    ->label('Unit of Measure')
-                    ->default('-')
-                    ->alignCenter()
-                    ->sortable()
-                    ->searchable()
-                    ->toggleable(isToggledHiddenByDefault: true),
                 Tables\Columns\CheckboxColumn::make('serial_number_motor')
                     ->label('Serial Number Motor')
                     ->disabled(true)
@@ -707,19 +692,12 @@ class StickerMasterResource extends Resource
                     ->label('Advanced Filters')
                     ->form([
                         Select::make('Plant')
-                            ->label('Search by Plant Name')
+                            ->label('Select Plant')
                             ->nullable()
                             ->options(function (callable $get) {
                                 $userHas = Filament::auth()->user()->plant_id;
 
-                                // return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::orderBy('code')->pluck('name', 'id')->toArray();
-                                if ($userHas && strlen($userHas) > 0) {
-                                    return Plant::where('id', $userHas)->pluck('name', 'id')->toArray();
-                                } else {
-                                    return Plant::whereHas('stickersMasters', function ($query) {
-                                        $query->whereNotNull('id');
-                                    })->orderBy('code')->pluck('name', 'id')->toArray();
-                                }
+                                return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::orderBy('code')->pluck('name', 'id')->toArray();
                             })
                             ->searchable()
                             ->reactive()

app/Filament/Resources/StockDataMasterResource.php

@@ -1,600 +0,0 @@
-<?php
-
-namespace App\Filament\Resources;
-
-use App\Filament\Exports\StockDataMasterExporter;
-use App\Filament\Imports\StockDataMasterImporter;
-use App\Filament\Resources\StockDataMasterResource\Pages;
-use App\Models\Item;
-use App\Models\Plant;
-use App\Models\StickerMaster;
-use App\Models\StockDataMaster;
-use Filament\Facades\Filament;
-use Filament\Forms;
-use Filament\Forms\Components\DateTimePicker;
-use Filament\Forms\Components\Radio;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Form;
-use Filament\Notifications\Notification;
-use Filament\Resources\Resource;
-use Filament\Tables;
-use Filament\Tables\Actions\ExportAction;
-use Filament\Tables\Actions\ImportAction;
-use Filament\Tables\Filters\Filter;
-use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
-
-class StockDataMasterResource extends Resource
-{
-    protected static ?string $model = StockDataMaster::class;
-
-    protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
-
-    protected static ?string $navigationGroup = 'Cycle Count Software';
-
-    public static function form(Form $form): Form
-    {
-        return $form
-            ->schema([
-                Forms\Components\Select::make('plant_id')
-                    ->label('Plant')
-                    ->reactive()
-                    ->relationship('plant', 'name')
-                    ->required(),
-                Forms\Components\Select::make('sticker_master_id')
-                    ->label('Item Code')
-                    ->reactive()
-                    ->required()
-                    ->searchable()
-                    ->options(function ($get) {
-                        if (! $get('plant_id')) {
-                            return [];
-                        }
-
-                        return StickerMaster::with('item')
-                            ->where('plant_id', $get('plant_id'))
-                            ->get()
-                            ->pluck('item.code', 'id')
-                            ->toArray();
-                    }),
-                Forms\Components\TextInput::make('location')
-                    ->label('Location'),
-                Forms\Components\TextInput::make('bin')
-                    ->label('Bin'),
-                Forms\Components\TextInput::make('serial_number')
-                    ->label('Serial Number'),
-                Forms\Components\TextInput::make('batch')
-                    ->label('Batch'),
-                Forms\Components\TextInput::make('quantity')
-                    ->label('Quantity'),
-                Forms\Components\TextInput::make('doc_no')
-                    ->label('Doc No'),
-                Forms\Components\Select::make('type')
-                    ->label('Type')
-                    ->options([
-                        '0' => 'FG',
-                        '1' => 'NON-FG',
-                    ]),
-                Forms\Components\TextInput::make('motor_scanned_status')
-                    ->label('Motor Scanned Status'),
-                Forms\Components\TextInput::make('pump_scanned_status')
-                    ->label('Pump Scanned Status'),
-                Forms\Components\TextInput::make('capacitor_scanned_status')
-                    ->label('Capacitor Scanned Status'),
-                Forms\Components\TextInput::make('scanned_status_set')
-                    ->label('Scanned Status Set'),
-                Forms\Components\TextInput::make('panel_box_item_code')
-                    ->label('Panel Box Item Code'),
-                Forms\Components\TextInput::make('panel_box_supplier')
-                    ->label('Panel Box Supplier'),
-                Forms\Components\TextInput::make('panel_box_sno')
-                    ->label('Panel Box Sno'),
-                Forms\Components\TextInput::make('scanned_status')
-                    ->label('Scanned Status'),
-                Forms\Components\TextInput::make('scanned_quantity')
-                    ->label('Scanned Quantity'),
-                Forms\Components\Hidden::make('created_by')
-                    ->label('Created By')
-                    ->default(Filament::auth()->user()?->name),
-                Forms\Components\Hidden::make('updated_by')
-                    ->label('Updated By')
-                    ->default(Filament::auth()->user()?->name),
-            ]);
-    }
-
-    public static function table(Table $table): Table
-    {
-        return $table
-            ->columns([
-                Tables\Columns\TextColumn::make('No.')
-                    ->label('No.')
-                    ->getStateUsing(function ($record, $livewire, $column, $rowLoop) {
-                        $paginator = $livewire->getTableRecords();
-                        $perPage = method_exists($paginator, 'perPage') ? $paginator->perPage() : 10;
-                        $currentPage = method_exists($paginator, 'currentPage') ? $paginator->currentPage() : 1;
-
-                        return ($currentPage - 1) * $perPage + $rowLoop->iteration;
-                    }),
-                Tables\Columns\TextColumn::make('plant.name')
-                    ->label('Plant')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('stickerMaster.item.code')
-                    ->label('Item Code')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('type')
-                    ->label('Type')
-                    ->alignCenter()
-                    ->searchable()
-                    ->formatStateUsing(fn ($state) => match ($state) {
-                        '0' => 'FG',
-                        '1' => 'NON-FG',
-                        default => '-',
-                    })
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('location')
-                    ->label('Location')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('bin')
-                    ->label('Bin')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('serial_number')
-                    ->label('Serial Number')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('batch')
-                    ->label('Batch')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('quantity')
-                    ->label('Quantity')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('doc_no')
-                    ->label('Document Number')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('motor_scanned_status')
-                    ->label('Motor Scanned Status')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable()
-                    ->visible(fn ($livewire) => ($livewire->tableFilters['advanced_filters']['type'] ?? null) != '1'),
-                Tables\Columns\TextColumn::make('pump_scanned_status')
-                    ->label('Pump Scanned Status')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable()
-                    ->visible(fn ($livewire) => ($livewire->tableFilters['advanced_filters']['type'] ?? null) != '1'),
-                Tables\Columns\TextColumn::make('capacitor_scanned_status')
-                    ->label('Capacitor Scanned Status')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable()
-                    ->visible(fn ($livewire) => ($livewire->tableFilters['advanced_filters']['type'] ?? null) != '1'),
-                Tables\Columns\TextColumn::make('scanned_status_set')
-                    ->label('Scanned Status Set')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable()
-                    ->visible(fn ($livewire) => ($livewire->tableFilters['advanced_filters']['type'] ?? null) != '1'),
-                Tables\Columns\TextColumn::make('panel_box_item_code')
-                    ->label('Panel Box Item Code')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable()
-                    ->visible(fn ($livewire) => ($livewire->tableFilters['advanced_filters']['type'] ?? null) != '1'),
-                Tables\Columns\TextColumn::make('panel_box_supplier')
-                    ->label('Panel Box Supplier')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable()
-                    ->visible(fn ($livewire) => ($livewire->tableFilters['advanced_filters']['type'] ?? null) != '1'),
-                Tables\Columns\TextColumn::make('panel_box_sno')
-                    ->label('Panel Box Serial Number')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable()
-                    ->visible(fn ($livewire) => ($livewire->tableFilters['advanced_filters']['type'] ?? null) != '1'),
-                Tables\Columns\TextColumn::make('scanned_status')
-                    ->label('Scanned Status')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('scanned_quantity')
-                    ->label('Scanned Quantity')
-                    ->alignCenter()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('system_stock')
-                    ->label('System Stock')
-                    ->alignCenter()
-                    ->getStateUsing(fn ($record) => $record->quantity),
-                Tables\Columns\TextColumn::make('scanned_stock')
-                    ->label('Scanned Stock')
-                    ->alignCenter()
-                    ->getStateUsing(fn ($record) => $record->scanned_quantity),
-                Tables\Columns\TextColumn::make('duplicate_stock')
-                    ->label('Duplicate Stock')
-                    ->alignCenter()
-                    ->getStateUsing(function ($record) {
-                        return \App\Models\DuplicateStock::where('stock_data_master_id', $record->id)->count();
-                    }),
-                Tables\Columns\TextColumn::make('not_in_stock')
-                    ->label('Not In Stock')
-                    ->alignCenter()
-                    ->getStateUsing(function ($record) {
-                        return \App\Models\NotInStock::where('serial_number', $record->serial_number)
-                            ->where('plant_id', $record->plant_id)
-                            ->count();
-                    }),
-                Tables\Columns\TextColumn::make('physical_stock')
-                    ->label('Physical Stock')
-                    ->alignCenter()
-                    ->getStateUsing(function ($record) {
-
-                        $duplicate = \App\Models\DuplicateStock::where('stock_data_master_id', $record->id)->count();
-
-                        $notInStock = \App\Models\NotInStock::where('serial_number', $record->serial_number)
-                            ->where('plant_id', $record->plant_id)
-                            ->count();
-
-                        $scanned = $record->scanned_quantity ?? 0;
-
-                        return $scanned + $duplicate + $notInStock;
-                    }),
-                Tables\Columns\TextColumn::make('stock_difference')
-                    ->label('Stock Difference Count')
-                    ->alignCenter()
-                    ->getStateUsing(function ($record) {
-
-                        $duplicate = \App\Models\DuplicateStock::where('stock_data_master_id', $record->id)->count();
-
-                        $notInStock = \App\Models\NotInStock::where('serial_number', $record->serial_number)
-                            ->where('plant_id', $record->plant_id)
-                            ->count();
-
-                        $scanned = (int) $record->scanned_quantity;
-
-                        $physicalStock = $scanned + $duplicate + $notInStock;
-
-                        $systemStock = (int) $record->quantity;
-
-                        $difference = $physicalStock - $systemStock;
-
-                        return max($difference, 0); // prevents negative values
-                    }),
-                Tables\Columns\TextColumn::make('created_at')
-                    ->label('Created At')
-                    ->alignCenter()
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-                Tables\Columns\TextColumn::make('updated_at')
-                    ->label('Updated At')
-                    ->alignCenter()
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-                Tables\Columns\TextColumn::make('deleted_at')
-                    ->label('Deleted At')
-                    ->alignCenter()
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-            ])
-            ->filters([
-                Tables\Filters\TrashedFilter::make(),
-                Filter::make('advanced_filters')
-                    ->label('Advanced Filters')
-                    ->form([
-                        Radio::make('type')
-                            ->label('Stock Type')
-                            ->options([
-                                '0' => 'FG',
-                                '1' => 'NON-FG',
-                            ])
-                            ->inline()
-                            ->default('0')
-                            ->nullable(),
-                        Select::make('Plant')
-                            ->label('Select Plant')
-                            ->nullable()
-                            ->options(function (callable $get) {
-                                $userHas = Filament::auth()->user()->plant_id;
-
-                                if ($userHas && strlen($userHas) > 0) {
-                                    return Plant::where('id', $userHas)->pluck('name', 'id')->toArray();
-                                } else {
-                                    return Plant::whereHas('stockDataMasters', function ($query) {
-                                        $query->whereNotNull('id');
-                                    })->orderBy('code')->pluck('name', 'id');
-                                }
-                            })
-                            ->reactive()
-                            ->afterStateUpdated(function ($state, callable $set, callable $get): void {
-                                $set('sticker_master_id', null);
-                                $set('updated_by', null);
-                            }),
-                        TextInput::make('location')
-                            ->label('Location')
-                            ->placeholder(placeholder: 'Enter Location'),
-                        TextInput::make('serial_number')
-                            ->label('Serial Number')
-                            ->placeholder(placeholder: 'Enter Serial Number'),
-                        Select::make('sticker_master_id')
-                            ->label('Search by Item Code')
-                            ->nullable()
-                            ->options(function (callable $get) {
-                                $pId = $get('Plant');
-
-                                if (empty($pId)) {
-                                    return [];
-                                }
-
-                                return Item::whereHas('stickerMasters', function ($query) use ($pId) {
-                                    if ($pId) {
-                                        $query->where('plant_id', $pId);
-                                    }
-                                    // $query->whereHas('stockDataMasters');
-                                })->pluck('code', 'id');
-                            })
-                            ->searchable()
-                            ->reactive(),
-                        Select::make('scanned_status')
-                            ->label('Scanned Status')
-                            ->nullable()
-                            ->options([
-                                'Scanned' => 'Scanned',
-                                'Pending' => 'Pending',
-                            ])
-                            ->searchable()
-                            ->reactive(),
-                        Select::make('updated_by')
-                            ->label('Created By')
-                            ->nullable()
-                            ->options(function (callable $get) {
-                                $plantId = $get('Plant');
-                                if (! $plantId) {
-                                    return StockDataMaster::whereNotNull('updated_by')->select('updated_by')->distinct()->pluck('updated_by', 'updated_by');
-                                } else {
-                                    return StockDataMaster::where('plant_id', $plantId)->whereNotNull('updated_by')->select('updated_by')->distinct()->pluck('updated_by', 'updated_by');
-                                }
-                            })
-                            ->searchable()
-                            ->reactive(),
-                        DateTimePicker::make(name: 'created_from')
-                            ->label('Created From')
-                            ->placeholder(placeholder: 'Select From DateTime')
-                            ->reactive()
-                            ->native(false),
-                        DateTimePicker::make('created_to')
-                            ->label('Created To')
-                            ->placeholder(placeholder: 'Select To DateTime')
-                            ->reactive()
-                            ->native(false),
-                    ])
-                    ->query(function ($query, array $data) {
-                        if (! isset($data['type']) && (empty($data['Plant']) && empty($data['location']) && empty($data['serial_number']) && empty($data['created_from']) && empty($data['created_to']) && empty($data['updated_by']) && empty($data['scanned_status']) && empty($data['sticker_master_id']))) {
-
-                            if (empty($data['type'])) {
-                                Notification::make()
-                                    ->title('Please, choose valid type to filter.')
-                                    ->danger()
-                                    ->send();
-                            }
-
-                            return $query->whereRaw('1 = 0');
-                        }
-
-                        if ($data['type'] != '') {
-
-                            if ($data['type'] == '0') {
-
-                                $query->where('type', '0');
-
-                                if (! empty($data['scanned_status'])) {
-
-                                    if ($data['scanned_status'] == 'Scanned') {
-                                        $query->whereNotNull('scanned_status')
-                                            ->where('scanned_status', '!=', '');
-                                    } elseif ($data['scanned_status'] == 'Pending') {
-
-                                        $query->where(function ($query) {
-                                            $query->whereNull('scanned_status')
-                                                ->orWhere('scanned_status', '!=', 'Scanned');
-                                        });
-
-                                    }
-                                }
-                            } elseif ($data['type'] == '1') {
-                                $query->where('type', '1')
-                                    ->whereNotNull('quantity');
-
-                                if ($data['scanned_status']) {
-
-                                    if ($data['scanned_status'] == 'Scanned') {
-
-                                        $query->whereNotNull('scanned_status')
-                                            ->where('scanned_status', '!=', '');
-
-                                    } elseif ($data['scanned_status'] == 'Pending') {
-
-                                        $query->where(function ($q) {
-                                            $q->whereNull('scanned_status')
-                                                ->orWhere('scanned_status', '!=', 'Scanned');
-                                        });
-                                    }
-                                }
-                            }
-                        } else {
-                            if ($data['scanned_status']) {
-
-                                if ($data['scanned_status'] == 'Scanned') {
-
-                                    $query->whereNotNull('scanned_status')
-                                        ->where('scanned_status', '!=', '');
-
-                                } elseif ($data['scanned_status'] == 'Pending') {
-
-                                    $query->where(function ($q) {
-                                        $q->whereNull('scanned_status')
-                                            ->orWhere('scanned_status', '!=', 'Scanned');
-                                    });
-                                }
-                            }
-                        }
-
-                        if (! empty($data['Plant'])) { // $plant = $data['Plant'] ?? null
-                            $query->where('plant_id', $data['Plant']);
-                        } else {
-                            $userHas = Filament::auth()->user()->plant_id;
-
-                            if ($userHas && strlen($userHas) > 0) {
-                                return $query->whereRaw('1 = 0');
-                            }
-                        }
-
-                        if (! empty($data['location'])) {
-                            $query->where('location', 'like', '%'.$data['location'].'%');
-                        }
-
-                        if (! empty($data['serial_number'])) {
-                            $query->where('serial_number', 'like', '%'.$data['serial_number'].'%');
-                        }
-
-                        if (! empty($data['created_from'])) {
-                            $query->where('created_at', '>=', $data['created_from']);
-                        }
-
-                        if (! empty($data['created_to'])) {
-                            $query->where('created_at', '<=', $data['created_to']);
-                        }
-
-                        if (! empty($data['updated_by'])) {
-                            $query->where('updated_by', $data['updated_by']);
-                        }
-
-                        if (! empty($data['sticker_master_id'])) {
-                            $stickerMasterIds = StickerMaster::where('item_id', $data['sticker_master_id'])
-                                ->pluck('id')
-                                ->toArray();
-
-                            if (! empty($stickerMasterIds)) {
-                                $query->whereIn('sticker_master_id', $stickerMasterIds);
-                            }
-                        }
-                    })
-                    ->indicateUsing(function (array $data) {
-                        $indicators = [];
-
-                        if (! empty($data['Plant'])) {
-                            $indicators[] = 'Plant: '.Plant::where('id', $data['Plant'])->value('name');
-                        } else {
-                            $userHas = Filament::auth()->user()->plant_id;
-
-                            if ($userHas && strlen($userHas) > 0) {
-                                return 'Plant: Choose plant to filter records.';
-                            }
-                        }
-
-                        if (! empty($data['location'])) {
-                            $indicators[] = 'Location: '.$data['location'];
-                        }
-
-                        if (! empty($data['serial_number'])) {
-                            $indicators[] = 'Serial Number: '.$data['serial_number'];
-                        }
-
-                        if (! empty($data['sticker_master_id'])) {
-                            $itemCode = Item::find($data['sticker_master_id'])->code ?? 'Unknown';
-                            $indicators[] = 'Item Code: '.$itemCode;
-                        }
-
-                        if (! empty($data['updated_by'])) {
-                            $indicators[] = 'Created By: '.$data['updated_by'];
-                        }
-
-                        if (! empty($data['created_from'])) {
-                            $indicators[] = 'From: '.$data['created_from'];
-                        }
-
-                        if (! empty($data['created_to'])) {
-                            $indicators[] = 'To: '.$data['created_to'];
-                        }
-
-                        if (! empty($data['scanned_status'])) {
-                            $indicators[] = 'Scanned Status: '.$data['scanned_status'];
-                        }
-
-                        return $indicators;
-                    }),
-            ])
-            ->filtersFormMaxHeight('280px')
-            ->actions([
-                Tables\Actions\ViewAction::make(),
-                Tables\Actions\EditAction::make(),
-            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make(),
-                    Tables\Actions\ForceDeleteBulkAction::make(),
-                    Tables\Actions\RestoreBulkAction::make(),
-                ]),
-            ])
-            ->headerActions([
-                ImportAction::make()
-                    ->label('Import Stock Data')
-                    ->color('warning')
-                    ->importer(StockDataMasterImporter::class)
-                    ->visible(function () {
-                        return Filament::auth()->user()->can('view import stock data master');
-                    }),
-                ExportAction::make()
-                    ->label('Export Stock Data')
-                    ->color('warning')
-                    ->exporter(StockDataMasterExporter::class)
-                    ->visible(function () {
-                        return Filament::auth()->user()->can('view export stock data master');
-                    }),
-            ]);
-    }
-
-    public static function getRelations(): array
-    {
-        return [
-            //
-        ];
-    }
-
-    public static function getPages(): array
-    {
-        return [
-            'index' => Pages\ListStockDataMasters::route('/'),
-            'create' => Pages\CreateStockDataMaster::route('/create'),
-            'view' => Pages\ViewStockDataMaster::route('/{record}'),
-            'edit' => Pages\EditStockDataMaster::route('/{record}/edit'),
-        ];
-    }
-
-    public static function getEloquentQuery(): Builder
-    {
-        return parent::getEloquentQuery()
-            ->withoutGlobalScopes([
-                SoftDeletingScope::class,
-            ]);
-    }
-}

app/Filament/Resources/StockDataMasterResource/Pages/CreateStockDataMaster.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\StockDataMasterResource\Pages;
-
-use App\Filament\Resources\StockDataMasterResource;
-use Filament\Actions;
-use Filament\Resources\Pages\CreateRecord;
-
-class CreateStockDataMaster extends CreateRecord
-{
-    protected static string $resource = StockDataMasterResource::class;
-}

app/Filament/Resources/StockDataMasterResource/Pages/EditStockDataMaster.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\StockDataMasterResource\Pages;
-
-use App\Filament\Resources\StockDataMasterResource;
-use Filament\Actions;
-use Filament\Resources\Pages\EditRecord;
-
-class EditStockDataMaster extends EditRecord
-{
-    protected static string $resource = StockDataMasterResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\ViewAction::make(),
-            Actions\DeleteAction::make(),
-            Actions\ForceDeleteAction::make(),
-            Actions\RestoreAction::make(),
-        ];
-    }
-}

app/Filament/Resources/StockDataMasterResource/Pages/ListStockDataMasters.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\StockDataMasterResource\Pages;
-
-use App\Filament\Resources\StockDataMasterResource;
-use Filament\Actions;
-use Filament\Resources\Pages\ListRecords;
-
-class ListStockDataMasters extends ListRecords
-{
-    protected static string $resource = StockDataMasterResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\CreateAction::make(),
-        ];
-    }
-}

app/Filament/Resources/StockDataMasterResource/Pages/ViewStockDataMaster.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\StockDataMasterResource\Pages;
-
-use App\Filament\Resources\StockDataMasterResource;
-use Filament\Actions;
-use Filament\Resources\Pages\ViewRecord;
-
-class ViewStockDataMaster extends ViewRecord
-{
-    protected static string $resource = StockDataMasterResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\EditAction::make(),
-        ];
-    }
-}

app/Http/Controllers/ObdController.php

@@ -13,7 +13,10 @@ class ObdController extends Controller
     /**
      * Display a listing of the resource.
      */
-    public function index() {}
+    public function index()
+    {
+
+    }
 
     /**
      * Store a newly created resource in storage.
@@ -24,37 +27,33 @@ class ObdController extends Controller
         $expectedPw   = env('API_AUTH_PW');
 
         $header_auth = $request->header('Authorization');
-        $expectedToken = $expectedUser.':'.$expectedPw;
+        $expectedToken = $expectedUser . ':' . $expectedPw;
 
         // if("Bearer " . $expectedToken != $header_auth)
         // {
         //     return response("ERROR: Unauthorized", 403)
         //         ->header('Content-Type', 'text/plain');
         // }
-        if ('Bearer '.$expectedToken != $header_auth) {
+        if ("Bearer " . $expectedToken != $header_auth)
+        {
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => 'Invalid authorization token!',
+                'status_description' => 'Invalid authorization token!'
             ], 403);
         }
 
-        try {
+        try
+        {
             $data = $request->all();
             // Validate required fields
             $missing = [];
-            if (empty($data['plant_name'])) {
-                $missing[] = 'plant_name';
-            }
-            if (empty($data['obd_number'])) {
-                $missing[] = 'obd_number';
-            }
-            if (empty($data['line_numbers'])) {
-                $missing[] = 'line_numbers';
-            }
-
-            if (! empty($missing)) {
-                $message = 'Missing required field(s): '.implode(', ', $missing);
+            if (empty($data['plant_name'])) $missing[] = 'plant_name';
+            if (empty($data['obd_number'])) $missing[] = 'obd_number';
+            if (empty($data['line_numbers'])) $missing[] = 'line_numbers';
 
+            if (!empty($missing))
+            {
+                $message = "Missing required field(s): " . implode(', ', $missing);
                 // return response($message, 400)->header('Content-Type', 'text/plain');
                 return response()->json([
                     'status_code' => 'ERROR',
@@ -64,49 +63,53 @@ class ObdController extends Controller
 
             // OBD Number validation
             $obdNumber = $data['obd_number'];
-            if (Str::length($obdNumber) < 8 || ! ctype_alnum($obdNumber)) {
+            if (Str::length($obdNumber) < 8 || !ctype_alnum($obdNumber))
+            {
                 // return response("ERROR: OBD Number should contain minimum 8 digits", 400)
                 //     ->header('Content-Type', 'text/plain');
                 return response()->json([
                     'status_code' => 'ERROR',
-                    'status_description' => 'OBD number should contain minimum 8 digit alpha-numeric values only!',
+                    'status_description' => "OBD number should contain minimum 8 digit alpha-numeric values only!"
                 ], 400);
             }
 
             // Lookup plant_id by plant_name
             $plantId = Plant::where('name', $data['plant_name'])->value('id');
-            if (! $plantId) {
+            if (!$plantId) {
                 // return response("ERROR: Plant '{$data['plant_name']}' not found", 404)
                 //     ->header('Content-Type', 'text/plain');
                 return response()->json([
                     'status_code' => 'ERROR',
-                    'status_description' => "Plant '{$data['plant_name']}' not found!",
+                    'status_description' => "Plant '{$data['plant_name']}' not found!"
                 ], 404);
             }
 
-            // Check if OBD number exists for that plant
+            //Check if OBD number exists for that plant
             $obdRecords = WeightValidation::where('plant_id', $plantId)
                 ->where('obd_number', $obdNumber)
                 ->exists();
 
-            if (! $obdRecords) {
+            if (!$obdRecords)
+            {
                 // return response( "ERROR: OBD Number '$obdNumber' not found for plant '{$data['plant_name']}'",404)->header('Content-Type', 'text/plain');
                 return response()->json([
                     'status_code' => 'ERROR',
-                    'status_description' => "OBD Number '$obdNumber' not found for plant '{$data['plant_name']}'!",
+                    'status_description' => "OBD Number '$obdNumber' not found for plant '{$data['plant_name']}'!"
                 ], 404);
             }
 
             $missingLines = [];
             $alreadyUpdatedLines = [];
 
-            foreach ($data['line_numbers'] as $line) {
-                if ($line['line_number'] == '' || $line['line_number'] == null) {
+            foreach ($data['line_numbers'] as $line)
+            {
+                if ($line['line_number'] == '' || $line['line_number'] == null)
+                {
                     // return response("ERROR: Line Number can't be empty", 400)
                     //     ->header('Content-Type', 'text/plain');
                     return response()->json([
                         'status_code' => 'ERROR',
-                        'status_description' => "Line Number can't be empty!",
+                        'status_description' => "Line Number can't be empty!"
                     ], 404);
                 }
 
@@ -115,46 +118,50 @@ class ObdController extends Controller
                     ->where('line_number', $line['line_number'])
                     ->first();
 
-                if (! $record) {
+                if (!$record)
+                {
                     $missingLines[] = $line['line_number'];
-
                     continue;
                 }
 
                 $mandatoryFields = ['vehicle_number', 'bundle_number', 'heat_number', 'picked_weight', 'scanned_by'];
                 $missingFields = [];
 
-                foreach ($mandatoryFields as $field) {
-                    if ($line[$field] == '' || $line[$field] == null) {
+                foreach ($mandatoryFields as $field)
+                {
+                    if ($line[$field] == '' || $line[$field] == null)
+                    {
                         $missingFields[] = ucwords(str_replace('_', ' ', $field));
                     }
                 }
 
-                if (! empty($missingFields)) {
-                    if (count($missingFields) == 1) {
+                if (!empty($missingFields))
+                {
+                    if (count($missingFields) == 1)
+                    {
                         $fieldsString = $missingFields[0];
-                    } else {
+                    }
+                    else
+                    {
                         $lastField = array_pop($missingFields);
-                        $fieldsString = implode(', ', $missingFields).' and '.$lastField;
+                        $fieldsString = implode(', ', $missingFields) . ' and ' . $lastField;
                     }
 
-                    $message = $fieldsString." can't be empty for line_number {$line['line_number']}!";
-
+                    $message = $fieldsString . " can't be empty for line_number {$line['line_number']}!";
                     // return response($message, 400)->header('Content-Type', 'text/plain');
                     return response()->json([
                         'status_code' => 'ERROR',
-                        'status_description' => $message,
+                        'status_description' => $message
                     ], 400);
                 }
             }
 
-            if (! empty($missingLines)) {
-                $message = 'Line(s) '.implode(', ', $missingLines)." not found for Plant '{$data['plant_name']}' and OBD Number: '{$data['obd_number']}'!";
-
+            if (!empty($missingLines)) {
+                $message = "Line(s) " . implode(', ', $missingLines) . " not found for Plant '{$data['plant_name']}' and OBD Number: '{$data['obd_number']}'!";
                 // return response($message, 404)->header('Content-Type', 'text/plain');
                 return response()->json([
                     'status_code' => 'ERROR',
-                    'status_description' => $message,
+                    'status_description' => $message
                 ], 404);
             }
 
@@ -162,11 +169,11 @@ class ObdController extends Controller
             $internalDuplicates = [];
             $bundleChecks = [];
 
-            // Check for duplicates within the request
+            //Check for duplicates within the request
             foreach ($data['line_numbers'] as $line) {
                 $lineNumber = $line['line_number'];
-                $bundleNumber = trim((string) $line['bundle_number']);
-                $pairKey = $lineNumber.'|'.$bundleNumber;
+                $bundleNumber = trim((string)$line['bundle_number']);
+                $pairKey = $lineNumber . '|' . $bundleNumber;
 
                 if (isset($seenPairs[$pairKey])) {
                     $internalDuplicates[] = "Line Number {$lineNumber} with Bundle Number {$bundleNumber}";
@@ -179,7 +186,7 @@ class ObdController extends Controller
                 }
             }
 
-            // Check for duplicates in the database
+            //Check for duplicates in the database
 
             $bundleNumbers = array_column($bundleChecks, 'bundle_number');
             $lineNumbers = array_column($bundleChecks, 'line_number');
@@ -195,10 +202,10 @@ class ObdController extends Controller
                 $line = $row->line_number;
                 $bundle = $row->bundle_number;
 
-                if (! isset($grouped[$line])) {
+                if (!isset($grouped[$line])) {
                     $grouped[$line] = [];
                 }
-                if ($bundle && ! in_array($bundle, $grouped[$line])) {
+                if ($bundle && !in_array($bundle, $grouped[$line])) {
                     $grouped[$line][] = $bundle;
                 }
             }
@@ -209,37 +216,39 @@ class ObdController extends Controller
                 $dbDuplicates[] = "Line {$line}, has bundle numbers : {$bundlesStr}";
             }
 
-            // Return all errors if any duplicates found
+            //Return all errors if any duplicates found
             $allDuplicates = [];
-            if (! empty($internalDuplicates)) {
-                $allDuplicates[] = 'Duplicate(s) '.implode(', ', $internalDuplicates);
+            if (!empty($internalDuplicates))
+            {
+                $allDuplicates[] = "Duplicate(s) " . implode(', ', $internalDuplicates);
             }
-            if (! empty($dbDuplicates)) {
-                $allDuplicates[] = 'Already exists in database: '.implode('; ', $dbDuplicates);
+            if (!empty($dbDuplicates))
+            {
+                $allDuplicates[] = "Already exists in database: " . implode('; ', $dbDuplicates);
             }
 
-            if (! empty($allDuplicates)) {
+            if (!empty($allDuplicates)) {
                 // return response(
                 //     "Error:" . implode("\n", $allDuplicates),
                 //     400
                 // )->header('Content-Type', 'text/plain');
 
-                $retRes = implode(', and ', $allDuplicates);
-
+                $retRes = implode(", and ", $allDuplicates);
                 return response()->json([
                     'status_code' => 'ERROR',
-                    'status_description' => $retRes,
+                    'status_description' => $retRes
                 ], 400);
             }
 
-            // ..
+            //..
             $updated = 0;
             $inserted = 0;
             $updatedLines = [];
             $insertedLines = [];
             $lineTracker = [];
 
-            foreach ($data['line_numbers'] as $line) {
+            foreach ($data['line_numbers'] as $line)
+            {
                 $lineNumber = $line['line_number'];
                 $existing = WeightValidation::where('plant_id', $plantId)
                 ->where('obd_number', $obdNumber)
@@ -250,7 +259,8 @@ class ObdController extends Controller
                 })
                 ->first();
 
-                if ($existing) {
+                if($existing)
+                {
                     $existing->update([
                         'vehicle_number'   =>  $line['vehicle_number'] ?? null,
                         'bundle_number' => $line['bundle_number'] ?? null,
@@ -262,7 +272,9 @@ class ObdController extends Controller
                     $updated++;
                     $updatedLines[] = $lineNumber;
                     $lineTracker[$lineNumber] = 1;
-                } else {
+                }
+                else
+                {
                     $original = WeightValidation::where([
                         'plant_id'    => $plantId,
                         'obd_number'  => $obdNumber,
@@ -294,11 +306,11 @@ class ObdController extends Controller
             $responseMessage = "OBD Number '{$obdNumber}'";
 
             if ($updated > 0) {
-                $responseMessage .= ' updated successfully. Line Numbers: {'.implode(', ', $updatedLines).'}';
+                $responseMessage .= " updated successfully. Line Numbers: {" . implode(', ', $updatedLines) . "}";
             }
 
             if ($inserted > 0) {
-                $responseMessage .= 'Inserted successfully. Line Numbers: {'.implode(', ', $insertedLines).'}';
+                $responseMessage .= "Inserted successfully. Line Numbers: {" . implode(', ', $insertedLines) . "}";
             }
 
             // return response($responseMessage, 200)
@@ -308,28 +320,31 @@ class ObdController extends Controller
                 'status_description' => $responseMessage,
             ], 200);
 
-        } catch (\Exception $e) {
+        }
+        catch (\Exception $e)
+        {
             // response("ERROR: Server error", 500)->header('Content-Type', 'text/plain');
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => 'Store OBD data internal server error : '.$e?->getCode(),
+                'status_description' => 'Store OBD data internal server error : '.$e?->getCode()
             ], 500);
         }
     }
 
-    // Route::get('obd/get-test-datas', [ObdController::class, 'get_test']);
+    //Route::get('obd/get-test-datas', [ObdController::class, 'get_test']);
     public function get_test(Request $request)
     {
         $expectedUser = env('API_AUTH_USER');
         $expectedPw   = env('API_AUTH_PW');
 
         $header_auth = $request->header('Authorization');
-        $expectedToken = $expectedUser.':'.$expectedPw;
+        $expectedToken = $expectedUser . ':' . $expectedPw;
 
-        if ('Bearer '.$expectedToken != $header_auth) {
+        if ("Bearer " . $expectedToken != $header_auth)
+        {
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => 'Invalid authorization token!',
+                'status_description' => 'Invalid authorization token!'
             ], 403);
         }
 
@@ -359,41 +374,48 @@ class ObdController extends Controller
         //     ], 400);
         // }
 
+
         $productionOrder = $request->header('production-order');
-        if (empty($productionOrder)) {
+        if (empty($productionOrder))
+        {
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => "Production order can't be empty!",
+                'status_description' => "Production order can't be empty!"
             ], 400);
-        } elseif (Str::length($productionOrder) < 7 || ! is_numeric($productionOrder)) {
+        }
+        else if(Str::length($productionOrder) < 7 || !is_numeric($productionOrder))
+        {
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => 'Production order should contain minimum 7 digits numeric values only!',
+                'status_description' => "Production order should contain minimum 7 digits numeric values only!"
             ], 400);
         }
 
         $prodOrderExist = ($productionOrder == '1234567' || $productionOrder == '7654321');
 
-        if (! $prodOrderExist) {
+        if (!$prodOrderExist)
+        {
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => 'Production order not found!',
+                'status_description' => "Production order not found!"
             ], 400);
         }
 
-        try {
-            // return response("Successfully GET request Received", 200)->header('Content-Type', 'text/plain');
+        try
+        {
+            //return response("Successfully GET request Received", 200)->header('Content-Type', 'text/plain');
             $itemCode = Item::where('code', '123456')->where('plant_id', 1)->first();
-
             return response()->json([
                 'item_code' => $itemCode->code,
-                'item_description' => $itemCode->description,
+                'item_description' => $itemCode->description
             ], 200);
-        } catch (\Exception $e) {
-            // return response("ERROR: GET test data server error", 500)->header('Content-Type', 'text/plain');
+        }
+        catch (\Exception $e)
+        {
+            //return response("ERROR: GET test data server error", 500)->header('Content-Type', 'text/plain');
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => 'Get test data internal server error : '.$e?->getCode(),
+                'status_description' => 'Get test data internal server error : '.$e?->getCode()
             ], 500);
         }
     }
@@ -403,7 +425,7 @@ class ObdController extends Controller
         $expectedUser = env('API_AUTH_USER');
         $expectedPw   = env('API_AUTH_PW');
         $header_auth  = $request->header('Authorization');
-        $expectedToken = $expectedUser.':'.$expectedPw;
+        $expectedToken = $expectedUser . ':' . $expectedPw;
 
         // if ("Bearer " . $expectedToken != $header_auth)
         // {
@@ -411,48 +433,54 @@ class ObdController extends Controller
         //         ->header('Content-Type', 'text/plain');
         // }
 
-        if ('Bearer '.$expectedToken != $header_auth) {
+        if ("Bearer " . $expectedToken != $header_auth)
+        {
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => 'Invalid authorization token!',
+                'status_description' => 'Invalid authorization token!'
             ], 403);
         }
 
         $plantName = $request->header('plant-name');
         $obdNumber = $request->header('obd-number');
 
-        if (empty($plantName)) {
+        if (empty($plantName))
+        {
             // return response("ERROR: Plant Name can't be empty", 400)
             //     ->header('Content-Type', 'text/plain');
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => "Plant Name can't be empty!",
+                'status_description' => "Plant Name can't be empty!"
             ], 400);
-        } elseif (empty($obdNumber)) {
+        }
+        else if(empty($obdNumber))
+        {
             // return response("ERROR: OBD Number can't be empty", 400)
             // ->header('Content-Type', 'text/plain');
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => "OBD Number can't be empty!",
+                'status_description' => "OBD Number can't be empty!"
             ], 400);
-        } elseif (Str::length($obdNumber) < 8 || ! ctype_alnum($obdNumber)) {
+        }
+        else if(Str::length($obdNumber) < 8 || !ctype_alnum($obdNumber))
+        {
             // return response("ERROR: OBD Number should contain minimum 8 digits: '$obdNumber'", 400)
             // ->header('Content-Type', 'text/plain');
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => 'OBD number should contain minimum 8 digit alpha-numeric values only!',
+                'status_description' => "OBD number should contain minimum 8 digit alpha-numeric values only!"
             ], 400);
         }
 
         // Fetch the plant id by name
         $plantId = Plant::where('name', $plantName)->value('id');
 
-        if (! $plantId) {
+        if (!$plantId) {
             // return response("ERROR: Plant not found", 400)
             //     ->header('Content-Type', 'text/plain');
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => 'Plant not found!',
+                'status_description' => "Plant not found!"
             ], 400);
         }
 
@@ -465,12 +493,13 @@ class ObdController extends Controller
         ->where('obd_number', $obdNumber)
         ->exists();
 
-        if (! $exists) {
+        if (!$exists)
+        {
             // return response("ERROR: OBD number $obdNumber does not exist for plant '$plantName'", 404)
             //     ->header('Content-Type', 'text/plain');
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => "OBD number $obdNumber does not exist for plant '$plantName'!",
+                'status_description' => "OBD number $obdNumber does not exist for plant '$plantName'!"
             ], 400);
         }
 
@@ -485,7 +514,7 @@ class ObdController extends Controller
             // return response("SUCCESS: Already scanning process completed for the OBD Number", 200)->header('Content-Type', values: 'text/plain');
             return response()->json([
                 'status_code' => 'SUCCESS',
-                'status_description' => 'Already weight validation completed for the OBD Number!',
+                'status_description' => "Already weight validation completed for the OBD Number!"
             ], 200);
         }
 
@@ -501,20 +530,18 @@ class ObdController extends Controller
                     'OBD_Number' => $obdNumber,
                     'Line_Numbers' => $records->map(function ($item) use ($itemCodes) {
                         $itemInfo = $itemCodes[$item->item_id] ?? null;
-
                         return [
-                            'Line' => $item->line_number ?? '',
-                            'Material_Code' => $itemInfo->code ?? '',
-                            'Material_Description' => $itemInfo->description ?? '',
-                            'Batch_Number' => $item->batch_number ?? '',
+                            'Line' => $item->line_number ?? "",
+                            'Material_Code' => $itemInfo->code ?? "",
+                            'Material_Description' => $itemInfo->description ?? "",
+                            'Batch_Number' => $item->batch_number ?? "",
                             // 'Heat_Number' => $item->heat_number ?? "",
-                            'Actual_Weight' => $item->obd_weight ?? '',
+                            'Actual_Weight' => $item->obd_weight ?? "",
                         ];
-                    })->values()->toArray(),
-                ],
-            ],
+                    })->values()->toArray()
+                ]
+            ]
         ];
-
         return response()->json($ObdResponseStructure);
     }
 

app/Http/Controllers/PalletPrintController.php

@@ -105,11 +105,12 @@ class PalletPrintController extends Controller
             ->pluck('wire_packing_number')
             ->values();
 
+
         $index = $completedPallets->search($pallet);
 
-        $currentPalletNo = ($index != false) ? $index + 1 : 0;
+        $currentPalletNo = ($index !== false) ? $index + 1 : 0;
 
-        $boxLabel = $currentPalletNo.'/'.$totalBoxes;
+        $boxLabel = $currentPalletNo . '/' . $totalBoxes;
 
         // $completedPallets = WireMasterPacking::where('plant_id', $plant)
         //     ->select('wire_packing_number')
@@ -177,6 +178,7 @@ class PalletPrintController extends Controller
      * Store a newly created resource in storage.
      */
 
+
     // public function print(Request $request, $pallet, $plant)
     // {
     //     $customerId = $request->query('customer');
@@ -203,6 +205,7 @@ class PalletPrintController extends Controller
     //     $customerCode = $customer->customer_po ?? '';
     //     $customerName = $customer->customer_name ?? '';
 
+
     //     $totalBoxes = WireMasterPacking::where('plant_id', $plant)
     //         ->where('customer_po_master_id', $customerId)
     //         ->distinct('wire_packing_number')
@@ -220,6 +223,7 @@ class PalletPrintController extends Controller
     //         ->pluck('wire_packing_number')
     //         ->values();
 
+
     //     $index = $completedPallets->search($pallet);
 
     //     $currentPalletNo = ($index !== false) ? $index + 1 : 0;

app/Http/Controllers/PdfController.php

@@ -627,7 +627,7 @@ class PdfController extends Controller
             // 'coil_number'       => $proOrdAgPlant->coil_number ?? "",
             // 'order_quantity'    => (string)$proOrdAgPlant->order_quantity ?? "",
             'coil_number' => $currentCoil,
-            'order_quantity' => (string) $lastRecord->updated_order_quantity ?? '0.000',
+            'order_quantity' => (string) $lastRecord->order_quantity ?? '0.000',
             'ok_quantity' => (string) $okQty ?? '0',
             'not_ok_quantity' => (string) $notOkQty ?? '0',
             'received_quantity' => (string) (($totalReceivedQty == 0) ? '0.000' : $totalReceivedQty) ?? '0.000',
@@ -686,7 +686,7 @@ class PdfController extends Controller
         $itemCode = $data['item_code'] ?? '';
         $lineName = $data['line_name'] ?? '';
         $coilNo = $data['coil_number'] ?? '';
-        $updatedOrderQty = $data['order_quantity'] ?? 0;
+        $orderQty = $data['order_quantity'] ?? 0;
         $receivedQty = $data['received_quantity'] ?? 0;
         $scrapQty = $data['scrap_quantity'] ?? 0;
         $sfgNo = $data['sfg_number'] ?? '';
@@ -728,17 +728,6 @@ class PdfController extends Controller
             ], 404);
         }
 
-        if ($scrapQty == null || $scrapQty == '') {
-            $scrapQty = 0;
-        }
-
-        if ($rework == null || $rework == '' || ! $rework) {
-            return response()->json([
-                'status_code' => 'ERROR',
-                'status_description' => "Rework value can't be empty!",
-            ], 404);
-        }
-
         $line = Line::where('name', $lineName)->first();
 
         if (! $line) {
@@ -872,8 +861,7 @@ class PdfController extends Controller
             ->where('item_id', $itemId)
             ->sum('received_quantity');
 
-        $orderQty = 0;
-        if ($updatedOrderQty == 0) {
+        if ($orderQty == 0) {
             $orderExist = ProcessOrder::where('plant_id', $plantId)
                 ->where('process_order', $processOrder)
                 ->where('item_id', $itemId)->latest()->first();
@@ -881,7 +869,6 @@ class PdfController extends Controller
 
             if ($orderExist) {
                 $orderQty = $orderExist->order_quantity ?? 0;
-                $updatedOrderQty = $orderExist->updated_order_quantity ?? 0;
             } else {
                 return response()->json([
                     'status_code' => 'ERROR',
@@ -895,11 +882,9 @@ class PdfController extends Controller
             // ->value('order_quantity') ?? 0;
 
             if ($orderExist) {
-                // $existOrderQty = $orderExist->updated_order_quantity ?? 0;
-                $orderQty = $orderExist->order_quantity ?? 0;
-                $existUpdatedOrdQuan = $orderExist->updated_order_quantity ?? 0;
+                $existOrderQty = $orderExist->order_quantity ?? 0;
 
-                if ($existUpdatedOrdQuan != $updatedOrderQty) {
+                if ($existOrderQty != $orderQty) {
                     return response()->json([
                         'status_code' => 'ERROR',
                         'status_description' => "Order quantity doesn't equal to exist process order '{$processOrder}'",
@@ -910,6 +895,20 @@ class PdfController extends Controller
 
         $total = $alreadyReceived + $receivedQty;
 
+        if ($total > $orderQty) {
+            return response()->json([
+                'status_code' => 'ERROR',
+                'status_description' => "Received quantity should not exceed order quantity! Order Qty = {$orderQty}, Already Received Qty = {$alreadyReceived}, Trying to Insert Qty = {$receivedQty}",
+            ], 404);
+        }
+
+        if ($rework == null || $rework == '' || ! $rework) {
+            return response()->json([
+                'status_code' => 'ERROR',
+                'status_description' => "Rework value can't be empty!",
+            ], 404);
+        }
+
         if ($rework != 'Yes' && $rework != 'No') {
             return response()->json([
                 'status_code' => 'ERROR',
@@ -950,13 +949,6 @@ class PdfController extends Controller
                         ], 404);
                     }
 
-                    if ($total > $updatedOrderQty) {
-                        return response()->json([
-                            'status_code' => 'ERROR',
-                            'status_description' => "Rework received quantity should not exceed exist order quantity! Exist Order Qty = '{$updatedOrderQty}', Already Exist Total Received Qty = '{$alreadyReceived}', Trying to Insert Rework Received Qty = '{$receivedQty}'",
-                        ], 404);
-                    }
-
                     $existingCoil = ProcessOrder::where('plant_id', $plantId)
                         ->where('process_order', $processOrder)
                         ->where('line_id', $lineNamePlantId)
@@ -972,7 +964,6 @@ class PdfController extends Controller
                                 'item_id' => $itemId,
                                 'coil_number' => $coilNo,
                                 'order_quantity' => $orderQty,
-                                'updated_order_quantity' => $updatedOrderQty,
                                 'received_quantity' => $receivedQty,
                                 'scrap_quantity' => $scrapQty,
                                 'sfg_number' => $sfgNo,
@@ -1003,21 +994,6 @@ class PdfController extends Controller
                             ]);
                     }
                 } else {
-                    if ($coilNo > 1) {
-                        $prevCoilNo = (string) ($coilNo - 1);
-                        $existPrevCoil = ProcessOrder::where('plant_id', $plantId)
-                            ->where('process_order', $processOrder)
-                            ->where('coil_number', $prevCoilNo)
-                            ->first();
-
-                        if (! $existPrevCoil) {
-                            return response()->json([
-                                'status_code' => 'ERROR',
-                                'status_description' => "Previous coil number '{$prevCoilNo}' not exist against plant code '{$plantCode}' and process order '{$processOrder}'!",
-                            ], 404);
-                        }
-                    }
-
                     $existingCoil = ProcessOrder::where('plant_id', $plantId)
                         ->where('process_order', $processOrder)
                         ->where('line_id', $lineNamePlantId)
@@ -1031,19 +1007,6 @@ class PdfController extends Controller
                         ], 404);
                     }
 
-                    $existPrevCoil = ProcessOrder::where('plant_id', $plantId)
-                        ->where('process_order', $processOrder)
-                        ->where('item_id', $itemId)
-                        ->where('coil_number', $coilNo)
-                        ->first();
-
-                    if ($existPrevCoil->received_quantity < $receivedQty) {
-                        return response()->json([
-                            'status_code' => 'ERROR',
-                            'status_description' => "Rework received quantity should not exceed exist received quantity! Exist Received Qty = '{$existPrevCoil->received_quantity}', Trying to Insert Rework Received Qty = '{$receivedQty}'",
-                        ], 404);
-                    }
-
                     $updated = ProcessOrder::where('plant_id', $plantId)
                         ->where('process_order', $processOrder)
                         ->where('line_id', $lineNamePlantId)
@@ -1092,28 +1055,6 @@ class PdfController extends Controller
                     ], 404);
                 }
 
-                if ($coilNo > 1) {
-                    $prevCoilNo = (string) ($coilNo - 1);
-                    $existPrevCoil = ProcessOrder::where('plant_id', $plantId)
-                        ->where('process_order', $processOrder)
-                        ->where('coil_number', $prevCoilNo)
-                        ->first();
-
-                    if (! $existPrevCoil) {
-                        return response()->json([
-                            'status_code' => 'ERROR',
-                            'status_description' => "Previous coil number '{$prevCoilNo}' not exist against plant code '{$plantCode}' and process order '{$processOrder}'!",
-                        ], 404);
-                    }
-                }
-
-                if ($total > $updatedOrderQty) {
-                    return response()->json([
-                        'status_code' => 'ERROR',
-                        'status_description' => "Received quantity should not exceed exist order quantity! Exist Order Qty = '{$updatedOrderQty}', Already Exist Total Received Qty = '{$alreadyReceived}', Trying to Insert Received Qty = '{$receivedQty}'",
-                    ], 404);
-                }
-
                 ProcessOrder::Create(
                     [
                         'plant_id' => $plantId,
@@ -1122,7 +1063,6 @@ class PdfController extends Controller
                         'item_id' => $itemId,
                         'coil_number' => $coilNo,
                         'order_quantity' => $orderQty,
-                        'updated_order_quantity' => $updatedOrderQty,
                         'received_quantity' => $receivedQty,
                         'scrap_quantity' => $scrapQty,
                         'sfg_number' => $sfgNo,

app/Http/Controllers/ProductionStickerReprintController.php

@@ -77,6 +77,14 @@ class ProductionStickerReprintController extends Controller
         }
         else
         {
+            // if ($item->category == 'Submersible Motor')
+            // {
+            //     $copies = 1;
+            // }
+            // elseif ($item->category == 'Submersible Pump')
+            // {
+            //     $copies = 1;
+            // }
             $copies = 1;
 
             if ($serialNumberRaw) {

app/Http/Controllers/TestingPanelController.php

@@ -9,7 +9,14 @@ use App\Models\MotorTestingMaster;
 use App\Models\Plant;
 use App\Models\TestingPanelReading;
 use App\Models\WorkGroupMaster;
+use DB;
+use Filament\Notifications\Notification;
 use Illuminate\Http\Request;
+use Mpdf\Mpdf;
+use chillerlan\QRCode\QROptions;
+use chillerlan\QRCode\Output\QROutputInterface;
+use Mpdf\QrCode\Output;
+use Mpdf\QrCode\QrCode;
 use Str;
 
 class TestingPanelController extends Controller
@@ -31,148 +38,170 @@ class TestingPanelController extends Controller
         $expectedPw   = env('API_AUTH_PW');
 
         $header_auth = $request->header('Authorization');
-        $expectedToken = $expectedUser.':'.$expectedPw;
+        $expectedToken = $expectedUser . ':' . $expectedPw;
 
-        if ('Bearer '.$expectedToken != $header_auth) {
+        if ("Bearer " . $expectedToken != $header_auth)
+        {
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => 'Invalid authorization token!',
+                'status_description' => 'Invalid authorization token!'
             ], 403);
         }
 
         $data = $request->all();
 
-        if ($data['plant_code'] == null || $data['plant_code'] == '') {
+        if ($data['plant_code'] == null || $data['plant_code'] == '')
+        {
             // return response("ERROR: Please provide a valid plant code.", 400)
             //     ->header('Content-Type', 'text/plain');
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => "Plant code can't be empty!",
+                'status_description' => "Plant code can't be empty!"
             ], 400);
-        } elseif (Str::length($data['plant_code']) < 4 || ! is_numeric($data['plant_code']) || ! preg_match('/^[1-9]\d{3,}$/', $data['plant_code'])) {// !ctype_digit($data['plant_code'])
+        }
+        else if (Str::length($data['plant_code']) < 4 || !is_numeric($data['plant_code']) || !preg_match('/^[1-9]\d{3,}$/', $data['plant_code']))//!ctype_digit($data['plant_code'])
+        {
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => 'Invalid plant code found!',
+                'status_description' => "Invalid plant code found!"
             ], 400);
         }
 
         $plant = Plant::where('code', $data['plant_code'])->first();
-        if (! $plant) {
-            // return response("Plant not found.", 400)->header('Content-Type', 'text/plain');
+        if (!$plant) {
+            //return response("Plant not found.", 400)->header('Content-Type', 'text/plain');
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => 'Plant not found!',
+                'status_description' => 'Plant not found!'
             ], 400);
         }
 
         $plantId = $plant->id;
 
-        if ($data['line_name'] == null || $data['line_name'] == '') {
+        if ($data['line_name'] == null || $data['line_name'] == '')
+        {
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => "Group work center can't be empty!",
+                'status_description' => "Group work center can't be empty!"
             ], 400);
-        } elseif (Str::length($data['line_name']) < 0) {
+        }
+        else if (Str::length($data['line_name']) < 0)
+        {
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => 'Invalid group work center found!',
+                'status_description' => "Invalid group work center found!"
             ], 400);
         }
 
         $gWorkCenter = WorkGroupMaster::where('name', $data['line_name'])->first();
-        if (! $gWorkCenter) {
+        if (!$gWorkCenter)
+        {
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => 'Group work center not found!',
+                'status_description' => 'Group work center not found!'
             ], 400);
         }
 
         $gWorkCenter = WorkGroupMaster::where('name', $data['line_name'])->where('plant_id', $plantId)->first();
-        if (! $gWorkCenter) {
-            // return response(  "Line not found for the specified plant : {$data['plant_code']}",400)->header('Content-Type', 'text/plain');
+        if (!$gWorkCenter)
+        {
+            //return response(  "Line not found for the specified plant : {$data['plant_code']}",400)->header('Content-Type', 'text/plain');
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => "Group work center not found for the specified plant : '{$data['plant_code']}'!",
+                'status_description' => "Group work center not found for the specified plant : '{$data['plant_code']}'!"
             ], 400);
         }
 
         $gWorkCenterId = $gWorkCenter->id;
 
-        if ($data['machine_name'] == null || $data['machine_name'] == '') {
+        if ($data['machine_name'] == null || $data['machine_name'] == '')
+        {
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => "Work center can't be empty!",
+                'status_description' => "Work center can't be empty!"
             ], 400);
-        } elseif (Str::length($data['machine_name']) < 0) {
+        }
+        else if (Str::length($data['machine_name']) < 0)
+        {
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => 'Invalid work center found!',
+                'status_description' => "Invalid work center found!"
             ], 400);
         }
 
         $machine = Machine::where('work_center', $data['machine_name'])->first();
-        if (! $machine) {
+        if (!$machine)
+        {
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => 'Work center not found!',
+                'status_description' => 'Work center not found!'
             ], 400);
         }
 
         $machine = Machine::where('work_center', $data['machine_name'])->where('plant_id', $plantId)->first();
-        if (! $machine) {
+        if (!$machine)
+        {
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => "Work center not found for the specified plant : '{$data['plant_code']}'!",
+                'status_description' => "Work center not found for the specified plant : '{$data['plant_code']}'!"
             ], 400);
         }
 
         $machine = Machine::where('work_center', $data['machine_name'])->where('work_group_master_id', $gWorkCenterId)->first();
-        if (! $machine) {
+        if (!$machine)
+        {
             // return response("Machine not found for the specified line : {$data['line_name']}", 400)->header('Content-Type', 'text/plain');
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => "Work center not found for the specified Group work center : '{$data['line_name']}'!",
+                'status_description' => "Work center not found for the specified Group work center : '{$data['line_name']}'!"
             ], 400);
 
         }
 
         $machine = Machine::where('work_center', $data['machine_name'])->where('plant_id', $plantId)->where('work_group_master_id', $gWorkCenterId)->first();
-        if (! $machine) {
+        if (!$machine) {
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => "Work center not found for the specified Plant : '{$data['plant_code']}' and Group work center : '{$data['line_name']}'!",
+                'status_description' => "Work center not found for the specified Plant : '{$data['plant_code']}' and Group work center : '{$data['line_name']}'!"
             ], 400);
         }
 
         $lineId = $machine->line_id;
         $machineId = $machine->id;
 
-        try {
+        try
+        {
             $insertedSerials = [];
             $missedItemCodes = [];
             $duplicateItemCodes = [];
             $existSnoCount = [];
 
-            if (! empty($data['item_codes']) && is_array($data['item_codes'])) {
-                foreach ($data['item_codes'] as $item) {
+            if (!empty($data['item_codes']) && is_array($data['item_codes']))
+            {
+                foreach ($data['item_codes'] as $item)
+                {
                     $code = $item['item_code'] ?? null;
 
                     // Check if item_code is present
-                    if ($code == '' || $code == null) {
+                    if ($code == '' || $code == null)
+                    {
                         return response()->json([
                             'status_code' => 'ERROR',
-                            'status_description' => "Item code can't be empty!",
+                            'status_description' => "Item code can't be empty!"
                         ], 400);
                     }
 
                     // Collect duplicates
-                    if (isset($itemCodeCounts[$code])) {
+                    if (isset($itemCodeCounts[$code]))
+                    {
                         $itemCodeCounts[$code]++;
                         // Only add to duplicates array once
                         if ($itemCodeCounts[$code] == 2) {
                             $duplicateItemCodes[] = $code;
                         }
-                    } else {
+                    }
+                    else
+                    {
                         $itemCodeCounts[$code] = 1;
                     }
 
@@ -180,41 +209,43 @@ class TestingPanelController extends Controller
                         $query->where('code', $item['item_code']);
                     })->where('plant_id', $plantId)->first();
 
-                    if (! $motorTestingMaster) {
+                    if (!$motorTestingMaster) {
                         $missedItemCodes[] = $item['item_code'];
                     }
 
-                    if (! empty($item['serial_numbers']) && is_array($item['serial_numbers'])) {
-                        foreach ($item['serial_numbers'] as $serial) {
+                    if (!empty($item['serial_numbers']) && is_array($item['serial_numbers'])) {
+                        foreach ($item['serial_numbers'] as $serial)
+                        {
                             $existSnoCount[] = $serial['serial_number'];
                         }
                     }
                 }
 
                 // If any duplicates found, return error
-                if (! empty($duplicateItemCodes)) {
+                if (!empty($duplicateItemCodes)) {
                     return response()->json([
                         'status_code' => 'ERROR',
-                        'status_description' => 'Duplicate item codes found in request: '.implode(', ', $duplicateItemCodes),
+                        'status_description' => 'Duplicate item codes found in request: ' . implode(', ', $duplicateItemCodes)
                     ], 400);
                 }
 
                 $uniqueInvalidCodes = array_unique($missedItemCodes);
 
-                if (! empty($uniqueInvalidCodes)) {
+                if (!empty($uniqueInvalidCodes)) {
 
                 //    return response("Item codes : ". implode(', ', $uniqueInvalidCodes)." not found in motor testing master for the specified plant {$plant->name}", 400)
                 //     ->header('Content-Type', 'text/plain');
 
                     return response()->json([
                         'status_code' => 'ERROR',
-                        'status_description' => 'Item codes : '.implode(', ', $uniqueInvalidCodes)." not found in master for the specified plant : '{$plant->name}'!",
+                        'status_description' => "Item codes : ". implode(', ', $uniqueInvalidCodes)." not found in master for the specified plant : '{$plant->name}'!"
                     ], 400);
                 }
 
                 $insertedSnoCount = [];
 
-                foreach ($data['item_codes'] as $item) {
+                foreach ($data['item_codes'] as $item)
+                {
 
                     $motorTestingMaster = MotorTestingMaster::whereHas('item', callback: function ($query) use ($item) {
                         $query->where('code', $item['item_code']);
@@ -222,9 +253,11 @@ class TestingPanelController extends Controller
 
                     $motorTestingMasterId = $motorTestingMaster->id;
 
-                    if (! empty($item['serial_numbers']) && is_array($item['serial_numbers'])) {
-                        foreach ($item['serial_numbers'] as $serial) {
-                            // For update_count calculation
+                    if (!empty($item['serial_numbers']) && is_array($item['serial_numbers']))
+                    {
+                        foreach ($item['serial_numbers'] as $serial)
+                        {
+                            //For update_count calculation
                             $updateCount = [
                                 'plant_id'      => $plantId,
                                 'line_id'       => $lineId,
@@ -244,17 +277,17 @@ class TestingPanelController extends Controller
                             $maxLength = TestingPanelReading::where($updateCount)->selectRaw('MAX(LENGTH(update_count)) as max_length')->value('max_length');
 
                             // Then, get all records with that length
-                            $lastUpdateCount = TestingPanelReading::where($updateCount)->whereRaw('LENGTH(update_count) = ?', [$maxLength])->orderByDesc('update_count')->select('update_count')->first(); // ->get();
+                            $lastUpdateCount = TestingPanelReading::where($updateCount)->whereRaw('LENGTH(update_count) = ?', [$maxLength])->orderByDesc('update_count')->select('update_count')->first();//->get();
 
-                            $newUpdateCount = ($lastUpdateCount == null || $lastUpdateCount == '') ? 0 : (int) $lastUpdateCount?->update_count + 1; // $maxUpdateCount?->update_count
+                            $newUpdateCount = ($lastUpdateCount == null || $lastUpdateCount == '') ? 0 : (int)$lastUpdateCount?->update_count + 1;//$maxUpdateCount?->update_count
 
-                            $updateCountString = (string) $newUpdateCount;
+                            $updateCountString = (string)$newUpdateCount;
 
                             $row = [
                                 'plant_id'               => $plantId,
                                 'line_id'                => $lineId,
                                 'machine_id'             => $machineId,
-                                'motor_testing_master_id' => $motorTestingMasterId,
+                                'motor_testing_master_id'=> $motorTestingMasterId,
                                 'serial_number'          => $serial['serial_number'] ?? null,
                                 'winded_serial_number'   => $serial['winded_serial_number'] ?? null,
                                 'output'                 => $serial['output'] ?? null,
@@ -313,27 +346,32 @@ class TestingPanelController extends Controller
                 }
             }
 
-            if (! empty($insertedSerials)) {
-                if (count($existSnoCount) == count($insertedSnoCount)) {
+            if (!empty($insertedSerials))
+            {
+                if(count($existSnoCount) == count($insertedSnoCount))
+                {
                     // $messages[] = "Inserted serial numbers are: " . implode(', ', $insertedSerials);
                     return response()->json([
                         'status_code' => 'SUCCESS',
-                        'status_description' => 'Inserted serial numbers are: '.implode(', ', $insertedSerials),
+                        'status_description' => 'Inserted serial numbers are: ' . implode(', ', $insertedSerials)
                     ], 200);
-                } else {
-                    $missingSno = array_diff($existSnoCount, $insertedSnoCount);
-
+                }
+                else
+                {
+                    $missingSno = array_diff($existSnoCount,$insertedSnoCount);
                     return response()->json([
                         'status_code' => 'ERROR',
-                        'status_description' => 'Missed serial numbers are: '.implode(', ', $missingSno),
+                        'status_description' => "Missed serial numbers are: " . implode(', ', $missingSno)
                     ], 400);
                 }
             }
-        } catch (\Exception $e) {
+        }
+        catch (\Exception $e)
+        {
             // return response($e->getMessage(), 500)->header('Content-Type', 'text/plain');
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => 'Store testing panel readings internal server error : '.$e?->getCode(),
+                'status_description' => 'Store testing panel readings internal server error : '.$e?->getCode()
             ], 500);
         }
     }
@@ -346,13 +384,14 @@ class TestingPanelController extends Controller
         $expectedUser = env('API_AUTH_USER');
         $expectedPw   = env('API_AUTH_PW');
         $header_auth  = $request->header('Authorization');
-        $expectedToken = $expectedUser.':'.$expectedPw;
+        $expectedToken = $expectedUser . ':' . $expectedPw;
 
-        // $data = $request->all();
-        if ('Bearer '.$expectedToken != $header_auth) {
+        //$data = $request->all();
+        if ("Bearer " . $expectedToken != $header_auth)
+        {
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => 'Invalid authorization token!',
+                'status_description' => 'Invalid authorization token!'
             ], 403);
         }
 
@@ -360,46 +399,45 @@ class TestingPanelController extends Controller
         $itemCode = $request->header('item-code');
         // $description = $item ? $item->description : '';
 
-        if ($plantCode == null || $plantCode == '') {
+        if ($plantCode == null || $plantCode == '')
+        {
             // return response("ERROR: Plant Name can't be empty", 400)
             //     ->header('Content-Type', 'text/plain');
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => "Plant code can't be empty!",
+                'status_description' => "Plant code can't be empty!"
             ], 400);
-        } elseif (Str::length($plantCode) < 4 || ! is_numeric($plantCode) || ! preg_match('/^[1-9]\d{3,}$/', $plantCode)) {
+        }
+        else if (Str::length($plantCode) < 4 || !is_numeric($plantCode) || !preg_match('/^[1-9]\d{3,}$/', $plantCode))
+        {
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => 'Invalid plant code found!',
+                'status_description' => "Invalid plant code found!"
             ], 400);
-        } elseif ($itemCode == null || $itemCode == '' || ! $itemCode) {
+        }
+        else if($itemCode == null || $itemCode == '')
+        {
+            // return response("ERROR: OBD Number can't be empty", 400)
+            // ->header('Content-Type', 'text/plain');
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => "Item code can't be empty!",
-            ], 404);
-        } elseif (Str::length($itemCode) < 6) {
+                'status_description' => "Item Code can't be empty!"
+            ], 400);
+        }
+        else if(Str::length($itemCode) < 6 || !ctype_alnum($itemCode))
+        {
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => "Item code '{$itemCode}' should contain minimum 6 digits!",
-            ], 404);
-        } elseif (! ctype_alnum($itemCode)) {
-            return response()->json([
-                'status_code' => 'ERROR',
-                'status_description' => "Item code '{$itemCode}' should contain only alpha-numeric values!",
-            ], 404);
-        } elseif (! preg_match('/^[a-zA-Z1-9][a-zA-Z0-9]{5,}$/', $itemCode)) {
-            return response()->json([
-                'status_code' => 'ERROR',
-                'status_description' => "Item code '{$itemCode}' should not begin with '0'!",
-            ], 404);
+                'status_description' => "Invalid item code found!"
+            ], 400);
         }
 
         $plant = Plant::where('code', $plantCode)->first();
 
-        if (! $plant) {
+        if (!$plant) {
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => 'Plant not found!',
+                'status_description' => "Plant not found!"
             ], 400);
         }
 
@@ -407,79 +445,72 @@ class TestingPanelController extends Controller
 
         $item = Item::where('code', $itemCode)->first();
 
-        if (! $item) {
+        if (!$item)
+        {
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => 'Item code not found in item table!',
+                'status_description' => "Item Code not found in item table!"
             ], 404);
         }
 
         $item = Item::where('plant_id', $plantId)->where('code', $itemCode)->first();
 
-        if (! $item) {
+        if (!$item)
+        {
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => "Item code not found in item table for the plant : '$plant->name'!",
+                'status_description' => "Item Code not found in item table for the plant : '$plant->name'!"
             ], 404);
         }
 
-        $itemId = $item->id;
-
+        // Get description or empty string if not found
         $description = $item ? $item->description : '';
 
         $category = $item ? $item->category : '';
 
-        $motorTestingMaster = MotorTestingMaster::where('item_id', $itemId)->first();
+        $motorTestingMaster = MotorTestingMaster::where('plant_id', $plantId)->where('item_id', $item->id)->first();
 
-        if (! $motorTestingMaster) {
+        if (!$motorTestingMaster)
+        {
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => 'Item code not found in motor testing master table!',
-            ], 404);
-        }
-
-        $motorTestingMaster = MotorTestingMaster::where('plant_id', $plantId)->where('item_id', $itemId)->first();
-
-        if (! $motorTestingMaster) {
-            return response()->json([
-                'status_code' => 'ERROR',
-                'status_description' => "Item code not found in motor testing master table for the plant : '$plant->name'!",
+                'status_description' => "Item Code not found in motor testing master table for the plant : '$plant->name'!"
             ], 404);
         }
 
         $output = [
-            'mot_subassembly_code' => $motorTestingMaster->subassembly_code ?? '',
-            'mot_model_name' => ($itemCode == '123456') ? 'SAMPLE TYPE' : $description,
-            'mot_non_isi_model' => $motorTestingMaster->isi_model ? '0' : '1',
-            'mot_phase' => $motorTestingMaster->phase ?? '',
-            'mot_hp' => $motorTestingMaster->hp ?? '',
-            'mot_kw' => $motorTestingMaster->kw ?? '',
-            'mot_volt' => $motorTestingMaster->volt ?? '',
-            'mot_cur' => $motorTestingMaster->current ?? '',
-            'mot_rpm' => $motorTestingMaster->rpm ?? '',
-            'mot_rate_torque_kg' => $motorTestingMaster->torque ?? '',
-            'mot_freq' => $motorTestingMaster->frequency ?? '',
-            'mot_conn' => $motorTestingMaster->connection ?? '',
-            'mot_ins_res_limit' => $motorTestingMaster->ins_res_limit ?? '',
-            'mot_ins_res_type' => $motorTestingMaster->ins_res_type ?? '',
-            'mot_category' => $category,
-            'mot_routine_test_time' => $motorTestingMaster->routine_test_time ?? '',
-            'mot_res_ry_ll' => $motorTestingMaster->res_ry_ll ?? '',
-            'mot_res_ry_ul' => $motorTestingMaster->res_ry_ul ?? '',
-            'mot_res_yb_ll' => $motorTestingMaster->res_yb_ll ?? '',
-            'mot_res_yb_ul' => $motorTestingMaster->res_yb_ul ?? '',
-            'mot_res_br_ll' => $motorTestingMaster->res_br_ll ?? '',
-            'mot_res_br_ul' => $motorTestingMaster->res_br_ul ?? '',
-            'mot_lock_volt_limit' => $motorTestingMaster->lock_volt_limit ?? '',
-            'mot_leak_cur_limit' => $motorTestingMaster->leak_cur_limit ?? '',
-            'mot_lock_cur_ll' => $motorTestingMaster->lock_cur_ll ?? '',
-            'mot_lock_cur_ul' => $motorTestingMaster->lock_cur_ul ?? '',
-            'mot_noload_cur_ll' => $motorTestingMaster->noload_cur_ll ?? '',
-            'mot_noload_cur_ul' => $motorTestingMaster->noload_cur_ul ?? '',
-            'mot_noload_pow_ll' => $motorTestingMaster->noload_pow_ll ?? '',
-            'mot_noload_pow_ul' => $motorTestingMaster->noload_pow_ul ?? '',
-            'mot_noload_spd_ll' => $motorTestingMaster->noload_spd_ll ?? '',
-            'mot_noload_spd_ul' => $motorTestingMaster->noload_spd_ul ?? '',
+            "mot_subassembly_code"      => $motorTestingMaster->subassembly_code ?? "",
+            "mot_model_name"        => $description,
+            "mot_non_isi_model"     => $motorTestingMaster->isi_model ? "0" :"1",
+            "mot_phase"             => $motorTestingMaster->phase ?? "",
+            "mot_hp"                => $motorTestingMaster->hp ?? "",
+            "mot_kw"                => $motorTestingMaster->kw ?? "",
+            "mot_volt"              => $motorTestingMaster->volt ?? "",
+            "mot_cur"               => $motorTestingMaster->current ?? "",
+            "mot_rpm"               => $motorTestingMaster->rpm ?? "",
+            "mot_rate_torque_kg"    => $motorTestingMaster->torque ?? "",
+            "mot_freq"              => $motorTestingMaster->frequency ?? "",
+            "mot_conn"              => $motorTestingMaster->connection ?? "",
+            "mot_ins_res_limit"     => $motorTestingMaster->ins_res_limit ?? "",
+            "mot_ins_res_type"      => $motorTestingMaster->ins_res_type ?? "",
+            "mot_category"          => $category,
+            "mot_routine_test_time" => $motorTestingMaster->routine_test_time ?? "",
+            "mot_res_ry_ll"         => $motorTestingMaster->res_ry_ll ?? "",
+            "mot_res_ry_ul"         => $motorTestingMaster->res_ry_ul ?? "",
+            "mot_res_yb_ll"         => $motorTestingMaster->res_yb_ll ?? "",
+            "mot_res_yb_ul"         => $motorTestingMaster->res_yb_ul ?? "",
+            "mot_res_br_ll"         => $motorTestingMaster->res_br_ll ?? "",
+            "mot_res_br_ul"         => $motorTestingMaster->res_br_ul ?? "",
+            "mot_lock_volt_limit"   => $motorTestingMaster->lock_volt_limit ?? "",
+            "mot_leak_cur_limit"    => $motorTestingMaster->leak_cur_limit ?? "",
+            "mot_lock_cur_ll"       => $motorTestingMaster->lock_cur_ll ?? "",
+            "mot_lock_cur_ul"       => $motorTestingMaster->lock_cur_ul ?? "",
+            "mot_noload_cur_ll"     => $motorTestingMaster->noload_cur_ll ?? "",
+            "mot_noload_cur_ul"     => $motorTestingMaster->noload_cur_ul ?? "",
+            "mot_noload_pow_ll"     => $motorTestingMaster->noload_pow_ll ?? "",
+            "mot_noload_pow_ul"     => $motorTestingMaster->noload_pow_ul ?? "",
+            "mot_noload_spd_ll"     => $motorTestingMaster->noload_spd_ll ?? "",
+            "mot_noload_spd_ul"     => $motorTestingMaster->noload_spd_ul ?? ""
         ];
 
         return response()->json($output, 200);

app/Http/Controllers/UserController.php

@@ -30,7 +30,7 @@ class UserController extends Controller
      * Display the specified resource.
      */
     // show(string $id)
-    public function get_user_data(Request $request)
+    public function get_testing_data(Request $request)
     {
         $expectedUser = env('API_AUTH_USER');
         $expectedPw = env('API_AUTH_PW');

app/Livewire/StockDataTable.php

@@ -1,558 +0,0 @@
-<?php
-
-namespace App\Livewire;
-
-use App\Models\DuplicateStock;
-use App\Models\Item;
-use App\Models\NotInStock;
-use App\Models\StickerMaster;
-use App\Models\StockDataMaster;
-use Filament\Notifications\Notification;
-use Livewire\Component;
-use Livewire\WithPagination;
-
-class StockDataTable extends Component
-{
-    public $invoiceData = [];
-
-        use WithPagination;
-
-    protected $paginationTheme = 'tailwind';
-
-    // public $invoiceRecords;
-
-    public $plantId = 0;
-
-    public $package = [];
-
-    public $scannedIds = [];
-
-    public $scannedRecords = [];
-
-    public $scannedSerials = [];
-
-    public $packageCount = 0;
-
-    public string $location = '';
-
-    public bool $completedInvoice = false;
-
-    public bool $isSerial = false;
-
-    public $isnonQuanSfg = false;
-
-    public bool $onCapFocus = false;
-
-    public bool $emptyInvoice = false;
-
-    public bool $hasSearched = false;
-
-    public bool $materialInvoice = false;
-
-    public bool $showCapacitorInput = false;
-
-    public bool $isSfg = false;
-
-    public $itemCode, $serialNumber, $serial_number;
-
-    public $scannedSfgData = [];
-
-    // protected $listeners = ['refreshInvoiceData' => 'loadData',];
-
-    protected $listeners = [
-        'refreshEmptyInvoice' => 'loadEmptyData',
-        'refreshInvoiceData' => 'loadData',
-        'refreshSfgData' => 'loadSfgData',
-        'refreshSfgNonData' => 'loadSfgNonQuanData',
-        'confirmStockUpdate',
-        'confirmSerialUpdate',
-        'confirmSerialFGUpdate',
-        'confirmDuplicateUpdate'
-    ];
-
-    public $capacitorInput = '';
-
-    public $panel_box_supplier;
-
-    public $panel_box_code;
-
-    public $panel_box_serial_number;
-
-    public string $currentItemCode = '';
-
-    public string $currentSerialNumber = '';
-
-    public $stickerMasterId;
-
-    public $sNo;
-
-    public function confirmStockUpdate($plantId, $location, $bin, $stickerMasterId, $batch, $docNo, $quantity)
-    {
-
-        $record = NotInStock::where('plant_id', $plantId)
-            ->where('location', $location)
-            ->where('sticker_master_id', $stickerMasterId)
-            ->where('doc_no', $docNo)
-            ->where('bin', $bin)
-            ->first();
-
-        if (!$record) {
-
-            NotInStock::create([
-                'plant_id' => $plantId,
-                'location' => $location,
-                'bin' => $bin,
-                'sticker_master_id' => $stickerMasterId,
-                'type' => '1',
-                'serial_number' => $this->serialNumber ?? null,
-                'batch' => $batch ?? null,
-                'doc_no' => $docNo ?? null,
-                'scanned_quantity' => $quantity ?? '0',
-            ]);
-
-            Notification::make()
-                ->title('Record inserted successfully in not in stock table.')
-                ->success()
-                ->send();
-
-        } else {
-
-            $record->update([
-                'scanned_quantity' => $record->scanned_quantity + $quantity,
-                'batch' => $batch ?? null,
-                'doc_no' => $docNo ?? null,
-            ]);
-
-            Notification::make()
-                ->title('Record updated in not in stock table.')
-                ->success()
-                ->send();
-        }
-    }
-
-    public function confirmSerialUpdate($plantId, $location, $bin, $serial_number, $stickerMasterId, $batch, $docNo, $quantity)
-    {
-        $sNo = $serial_number;
-        $record = NotInStock::where('plant_id', $plantId)
-            ->where('location', $location)
-            ->where('sticker_master_id', $stickerMasterId)
-            ->where('serial_number', $sNo)
-            ->where('bin', $bin)
-            ->first();
-
-        if (!$record) {
-
-            NotInStock::create([
-                'plant_id' => $plantId,
-                'location' => $location,
-                'bin' => $bin,
-                'sticker_master_id' => $stickerMasterId,
-                'type' => '1',
-                'serial_number' => $sNo ?? null,
-                'batch' => $batch ?? null,
-                'doc_no' => $docNo ?? null,
-                'scanned_quantity' => $quantity ?? '1',
-            ]);
-
-            Notification::make()
-                ->title('Record inserted successfully in not in stock table.')
-                ->success()
-                ->send();
-
-        } else {
-
-            $record->update([
-                'batch' => $batch ?? null,
-            ]);
-
-            Notification::make()
-                ->title('Record updated in not in stock table.')
-                ->success()
-                ->send();
-        }
-    }
-
-    public function confirmDuplicateUpdate($plantId, $location, $bin, $serial_number, $stickerMasterId, $batch, $docNo, $quantity)
-    {
-        $sNo = $serial_number;
-        $stockRecord = StockDataMaster::where('serial_number', $sNo)
-            ->where('plant_id', $plantId)
-            ->first();
-
-        if (!$stockRecord) {
-            return;
-        }
-
-        $record = DuplicateStock::where('stock_data_master_id', $stockRecord->id)->first();
-
-        if (!$record) {
-
-            DuplicateStock::create([
-                'stock_data_master_id' => $stockRecord->id,
-            ]);
-
-            Notification::make()
-                ->title('Record inserted successfully in duplicate stock table.')
-                ->success()
-                ->send();
-
-        } else {
-
-            DuplicateStock::create([
-                'stock_data_master_id' => $stockRecord->id,
-            ]);
-
-            Notification::make()
-                ->title('Record inserted successfully in duplicate stock table.')
-                ->success()
-                ->send();
-        }
-    }
-
-    public function confirmSerialFGUpdate($plantId, $location, $bin, $serial_number, $stickerMasterId)
-    {
-        $sNo = $serial_number;
-        $record = NotInStock::where('plant_id', $plantId)
-            ->where('location', $location)
-            ->where('sticker_master_id', $stickerMasterId)
-            ->where('serial_number', $sNo)
-            ->where('bin', $bin)
-            ->first();
-
-        if (!$record) {
-
-            NotInStock::create([
-                'plant_id' => $plantId,
-                'location' => $location,
-                'bin' => $bin,
-                'sticker_master_id' => $stickerMasterId,
-                'type' => '0',
-                'serial_number' => $sNo ?? null,
-                'batch' => $batch ?? null,
-                'doc_no' => $docNo ?? null,
-                'scanned_quantity' => $quantity ?? '1',
-            ]);
-
-            Notification::make()
-                ->title('Record inserted successfully in not in stock table.')
-                ->success()
-                ->send();
-
-        } else {
-
-            $record->update([
-                'batch' => $batch ?? null,
-                'doc_no' => $docNo ?? null,
-            ]);
-
-            Notification::make()
-                ->title('Record updated in not in stock table.')
-                ->success()
-                ->send();
-        }
-    }
-
-    public function loadCompletedData($location, $plantId, $isSerial)
-    {
-        $this->plantId = $plantId;
-        $this->location = $location;
-        $this->completedInvoice = true;
-        $this->isSerial = $isSerial;
-        $this->onCapFocus = false;
-        $this->emptyInvoice = false;
-        $this->hasSearched = false;
-        $this->materialInvoice = false;
-        $this->packageCount = 0;
-        // $this->showCapacitorInput = false;
-        $this->dispatch('focus-invoice-number');
-    }
-
-    public function loadEmptyData($location, $plantId)
-    {
-        $this->plantId = $plantId;
-        $this->location = $location;
-        $this->completedInvoice = false;
-        $this->onCapFocus = false;
-        $this->emptyInvoice = true;
-        $this->hasSearched = false;
-        $this->materialInvoice = false;
-        $this->packageCount = 0;
-        // $this->showCapacitorInput = false;
-    }
-
-    public function loadSfgData($location, $plantId, $itemCode,$docNo)
-    {
-        $this->isSfg = true;
-        $this->hasSearched = false;
-        // $this->materialInvoice = false;
-        // $this->completedInvoice = false;
-        // $this->emptyInvoice = false;
-
-        $item = Item::where('plant_id', $plantId)
-                ->where('code', $itemCode)
-                ->first();
-
-        $itemId = $item->id;
-
-        $stickerMaster = StickerMaster::where('plant_id', $plantId)
-            ->where('item_id', $itemId)
-            ->first();
-
-        $stickerMasterId = $stickerMaster->id;
-
-        $record = StockDataMaster::with('stickerMaster.item')
-            ->where('plant_id', $plantId)
-            ->where('location', $location)
-            ->where('sticker_master_id', $stickerMasterId)
-            ->where('doc_no', $docNo)
-            ->where('type', '1')
-            ->first();
-
-        if ($record) {
-
-            $itemCode = optional($record->stickerMaster->item)->code;
-
-            $foundIndex = null;
-
-            foreach ($this->scannedSfgData as $index => $row) {
-
-                if (
-                    $row['location'] == $record->location &&
-                    $row['doc_no'] == $record->doc_no &&
-                    $row['item_code'] == $itemCode
-                ) {
-                    $foundIndex = $index;
-                    break;
-                }
-            }
-
-            if ($foundIndex !== null) {
-
-                $this->scannedSfgData[$foundIndex]['scanned_quantity'] = $record->scanned_quantity;
-
-            } else {
-
-                if (count($this->scannedSfgData) >= 100) {
-                    return;
-                }
-
-                $this->scannedSfgData[] = [
-                    'serial_number'     => $record->serial_number,
-                    'bin'               => $record->bin,
-                    'item_code'         => $itemCode,
-                    'batch'             => $record->batch,
-                    'doc_no'            => $record->doc_no,
-                    'quantity'          => $record->quantity,
-                    'scanned_quantity'  => $record->scanned_quantity,
-                    'location'          => $record->location,
-                    'updated_by'        => $record->updated_by,
-                ];
-            }
-        }
-    }
-
-    public function loadSfgNonQuanData($location, $plantId, $serialNumber, $itemCode){
-
-        $this->isnonQuanSfg = true;
-
-        $record = StockDataMaster::with('stickerMaster.item')
-            ->where('plant_id', $plantId)
-            ->where('location', $location)
-            ->where('serial_number', $serialNumber)
-            ->whereHas('stickerMaster.item', function ($q) use ($itemCode) {
-                $q->where('code', $itemCode);
-            })
-            ->where('type', '1')
-            ->orderBy('updated_at', 'desc')
-            ->first();
-
-        if ($record) {
-
-            // foreach ($this->scannedSerials as $row) {
-            //     if ($row['serial_number'] == $serialNumber) {
-            //         continue;
-            //     }
-            // }
-
-            // $this->scannedSerials[] = [
-            array_unshift($this->scannedSerials, [
-                'location' => $record->location,
-                'bin' => $record->bin ?? '',
-                'item_code' => $record->stickerMaster->item->code ?? '',
-                'serial_number' => $serialNumber,
-                'batch' => $record->batch ?? '',
-                'doc_no' => $record->doc_no ?? '',
-                'quantity' => $record->quantity ?? '',
-                'scanned_quantity' => $record->scanned_quantity ?? '',
-                'updated_by' => $record->updated_by ?? '',
-            ]);
-            // ];
-        }
-
-    }
-
-    public function loadData($location, $plantId, $itemCode, $serialNumber)
-    {
-        $this->location = $location;
-        $this->plantId = $plantId;
-        $this->itemCode = $itemCode;
-        $this->serialNumber = $serialNumber;
-
-
-        $this->completedInvoice = false;
-        $this->isSerial = true;
-        $this->emptyInvoice = false;
-        $this->hasSearched = true;
-        $this->materialInvoice = false;
-
-        $this->resetPage();
-        $this->packageCount = 0;
-
-        $item = Item::where('plant_id', $plantId)
-                ->where('code', $this->itemCode)
-                ->first();
-
-        $itemId = $item->id;
-
-        $stickerMaster = StickerMaster::where('plant_id', $plantId)
-            ->where('item_id', $itemId)
-            ->first();
-
-        $stickerMasterId = $stickerMaster->id;
-
-        $records = StockDataMaster::with('stickerMasterRelation')
-            ->where('location', $this->location)
-            ->where('type', '=', '0')
-            ->where('plant_id', $this->plantId)
-            ->where('sticker_master_id', $stickerMasterId)
-            ->where('serial_number', $this->serialNumber)
-            ->orderBy('updated_at', 'desc')
-            ->limit(100)
-            ->get();
-
-        foreach ($records as $record) {
-
-            if ($record->scanned_status == 'Scanned') {
-
-                if (!in_array($record->id, $this->scannedIds)) {
-                    $this->scannedIds[] = $record->id;
-                }
-
-            }
-        }
-
-        $this->scannedIds = array_slice(array_unique($this->scannedIds), 0, 100);
-
-
-        $this->packageCount = $records->sum(function ($record) {
-
-            $sm = $record->stickerMasterRelation;
-
-            if (! $sm) {
-                return 0;
-            }
-
-            $stickCount = 0;
-            $scannedCount = 0;
-
-
-            if ($sm->tube_sticker_motor == 1 || $sm->tube_sticker_pump == 1 || $sm->tube_sticker_pumpset == 1) {
-
-                if ($sm->tube_sticker_motor == 1) {
-                    $stickCount++;
-                    if ($record->motor_scanned_status == 1) {
-                        $scannedCount++;
-                    }
-                }
-
-                if (
-                    $sm->tube_sticker_pump == 1 ||
-                    ($sm->tube_sticker_pumpset != 1 &&
-                    $sm->tube_sticker_pump != 1 &&
-                    $sm->pack_slip_pump == 1)
-                ) {
-                    $stickCount++;
-                    if ($record->pump_scanned_status == 1) {
-                        $scannedCount++;
-                    }
-                }
-
-                if ($sm->tube_sticker_pumpset == 1) {
-                    $stickCount++;
-                    if ($record->scanned_status_set == 1) {
-                        $scannedCount++;
-                    }
-                }
-            } elseif ($sm->pack_slip_motor == 1 || $sm->pack_slip_pump == 1 || $sm->pack_slip_pumpset == 1) {
-                if ($sm->pack_slip_motor == 1) {
-                    $stickCount++;
-                    if ($record->motor_scanned_status == 1) {
-                        $scannedCount++;
-                    }
-                }
-
-                if ($sm->pack_slip_pump == 1) {
-                    $stickCount++;
-                    if ($record->pump_scanned_status == 1) {
-                        $scannedCount++;
-                    }
-                }
-
-                if ($sm->pack_slip_pumpset == 1) {
-                    $stickCount++;
-                    if ($record->scanned_status_set == 1) {
-                        $scannedCount++;
-                    }
-                }
-            }
-
-            return max($stickCount - $scannedCount, 0);
-        });
-
-        // $this->dispatch(
-        //     $onCapFocus ? 'focus-capacitor-input' : 'focus-serial-number'
-        // );
-    }
-
-    // public function getInvoiceRecordsProperty()
-    // {
-    //     return StockDataMaster::with('stickerMasterRelation.item')
-    //         ->where('plant_id', $this->plantId)
-    //         ->where('location', $this->location)
-    //         ->where('type', '=', '0')
-    //         ->where('scanned_status', 'Scanned')
-    //         // ->where(function ($query) {
-    //         //     $query->whereNull('scanned_status')
-    //         //         ->orWhere('scanned_status', 'Scanned');
-    //         // })
-    //         // ->when($this->hasSearched, function ($query) {
-    //         //     $query->where('invoice_number', $this->invoiceNumber)
-    //         //         ->where('plant_id', $this->plantId)
-    //         //         ->where('scanned_status', '=', '');
-    //         // })
-    //         ->orderBy('updated_at', 'desc')
-    //         ->paginate(6);
-    // }
-
-
-    public function getInvoiceRecordsProperty()
-    {
-        if (empty($this->scannedIds)) {
-            return collect();
-        }
-
-        return StockDataMaster::with('stickerMasterRelation.item')
-            ->whereIn('id', $this->scannedIds)
-            ->orderBy('updated_at', 'desc')
-            ->paginate(6);
-    }
-    public function render()
-    {
-        // return view('livewire.stock-data-table');
-        return view('livewire.stock-data-table', [
-            'records' => $this->invoiceRecords,
-            'scannedSfgData' => $this->scannedSfgData,
-            'scannedSerials' => $this->scannedSerials
-        ]);
-    }
-}

app/Models/ClassCharacteristic.php

@@ -15,8 +15,8 @@ class ClassCharacteristic extends Model
 
     protected $fillable = [
         'plant_id',
-        'machine_id',
         'item_id',
+        'machine_id',
         'aufnr',
         'class',
         'arbid',
@@ -106,14 +106,14 @@ class ClassCharacteristic extends Model
         'zmm_tagno',
         'zmm_year',
         'zmm_laser_name',
-        'zmm_logo_cp',
-        'zmm_logo_ce',
-        'zmm_logo_nsf',
         'zmm_beenote',
         'zmm_beenumber',
         'zmm_beestar',
         'zmm_codeclass',
         'zmm_colour',
+        'zmm_logo_cp',
+        'zmm_logo_ce',
+        'zmm_logo_nsf',
         'zmm_grade',
         'zmm_grwt_pset',
         'zmm_grwt_cable',
@@ -144,34 +144,24 @@ class ClassCharacteristic extends Model
         'zmm_usp',
         'mark_status',
         'marked_datetime',
-        'marked_physical_count',
-        'marked_expected_time',
         'marked_by',
         'man_marked_status',
         'man_marked_datetime',
         'man_marked_by',
         'motor_marked_status',
-        'motor_marked_physical_count',
-        'motor_expected_time',
         'motor_marked_by',
         'pump_marked_status',
-        'pump_marked_physical_count',
-        'pump_expected_time',
         'pump_marked_by',
-        'name_plate_marked_status',
-        'name_plate_expected_time',
-        'name_plate_marked_by',
         'motor_pump_pumpset_status',
-        'winded_serial_number',
         'motor_machine_name',
         'pump_machine_name',
-        'name_plate_machine_name',
         'pumpset_machine_name',
         'part_validation_1',
         'part_validation_2',
         'samlight_logged_name',
         'pending_released_status',
-        'has_work_flow_id',
+        'motor_expected_time',
+        'pump_expected_time',
         'created_at',
         'updated_at',
         'created_by',

app/Models/DuplicateStock.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\SoftDeletes;
-
-class DuplicateStock extends Model
-{
-    use SoftDeletes;
-
-    protected $fillable = [
-        'stock_data_master_id',
-        'created_at',
-		'updated_at',
-		'created_by',
-        'updated_by',
-    ];
-
-    public function stockDataMaster(): BelongsTo
-    {
-        return $this->belongsTo(StockDataMaster::class);
-    }
-}

app/Models/Item.php

@@ -64,11 +64,6 @@ class Item extends Model
         return $this->hasMany(CharacteristicValue::class);
     }
 
-    public function ClassCharacteristics()
-    {
-        return $this->hasMany(ClassCharacteristic::class, 'item_id', 'id');
-    }
-
     public function weightValidations()
     {
         return $this->hasMany(WeightValidation::class);

app/Models/Machine.php

@@ -43,11 +43,6 @@ class Machine extends Model
         return $this->hasMany(CharacteristicValue::class);
     }
 
-    public function ClassCharacteristics()
-    {
-        return $this->hasMany(ClassCharacteristic::class, 'machine_id', 'id');
-    }
-
     public function testingPanelReadings()
     {
         return $this->hasMany(TestingPanelReading::class);

app/Models/NotInStock.php

@@ -1,53 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\SoftDeletes;
-
-class NotInStock extends Model
-{
-    use SoftDeletes;
-
-    protected $fillable = [
-        'plant_id',
-        'sticker_master_id',
-        'location',
-        'bin',
-        'serial_number',
-        'batch',
-        'quantity',
-        'doc_no',
-        'type',
-        'motor_scanned_status',
-        'pump_scanned_status',
-        'capacitor_scanned_status',
-        'scanned_status_set',
-        'panel_box_item_code',
-        'panel_box_supplier',
-        'panel_box_sno',
-        'scanned_status',
-        'scanned_quantity',
-        'created_by',
-        'updated_by',
-        'created_at',
-        'updated_at',
-    ];
-
-    public function plant(): BelongsTo
-    {
-        return $this->belongsTo(Plant::class);
-    }
-
-    public function stickerMaster(): BelongsTo
-    {
-        return $this->belongsTo(StickerMaster::class);
-    }
-
-    public function stickerMasterRelation()
-    {
-        return $this->belongsTo(StickerMaster::class, 'sticker_master_id');
-    }
-
-}

app/Models/Plant.php

@@ -53,11 +53,6 @@ class Plant extends Model
         return $this->hasMany(InvoiceValidation::class, 'plant_id', 'id');
     }
 
-    public function stockDataMasters()
-    {
-        return $this->hasMany(StockDataMaster::class, 'plant_id', 'id');
-    }
-
     public function qualityValidations()
     {
         return $this->hasMany(QualityValidation::class, 'plant_id', 'id');
@@ -113,11 +108,6 @@ class Plant extends Model
         return $this->hasMany(EquipmentMaster::class, 'plant_id', 'id');
     }
 
-    public function ClassCharacteristics()
-    {
-        return $this->hasMany(ClassCharacteristic::class, 'plant_id', 'id');
-    }
-
     // public function rejectReasons()
     // {
     //     return $this->hasMany(RejectReason::class, 'plant_id', 'id');

app/Models/ProcessOrder.php

@@ -21,7 +21,6 @@ class ProcessOrder extends Model
         'coil_number',
         'order_quantity',
         'received_quantity',
-        'updated_order_quantity',
         'sfg_number',
         'machine_name',
         'scrap_quantity',

app/Models/StockDataMaster.php

@@ -1,53 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\SoftDeletes;
-
-class StockDataMaster extends Model
-{
-    use SoftDeletes;
-
-    protected $fillable = [
-        'plant_id',
-        'sticker_master_id',
-        'location',
-        'bin',
-        'serial_number',
-        'batch',
-        'quantity',
-        'doc_no',
-        'type',
-        'motor_scanned_status',
-        'pump_scanned_status',
-        'capacitor_scanned_status',
-        'scanned_status_set',
-        'panel_box_item_code',
-        'panel_box_supplier',
-        'panel_box_sno',
-        'scanned_status',
-        'scanned_quantity',
-        'created_by',
-        'updated_by',
-        'created_at',
-        'updated_at',
-    ];
-
-    public function plant(): BelongsTo
-    {
-        return $this->belongsTo(Plant::class);
-    }
-
-    public function stickerMaster(): BelongsTo
-    {
-        return $this->belongsTo(StickerMaster::class);
-    }
-
-    public function stickerMasterRelation()
-    {
-        return $this->belongsTo(StickerMaster::class, 'sticker_master_id');
-    }
-
-}

app/Policies/DuplicateStockPolicy.php

@@ -1,106 +0,0 @@
-<?php
-
-namespace App\Policies;
-
-use Illuminate\Auth\Access\Response;
-use App\Models\DuplicateStock;
-use App\Models\User;
-
-class DuplicateStockPolicy
-{
-    /**
-     * Determine whether the user can view any models.
-     */
-    public function viewAny(User $user): bool
-    {
-        return $user->checkPermissionTo('view-any DuplicateStock');
-    }
-
-    /**
-     * Determine whether the user can view the model.
-     */
-    public function view(User $user, DuplicateStock $duplicatestock): bool
-    {
-        return $user->checkPermissionTo('view DuplicateStock');
-    }
-
-    /**
-     * Determine whether the user can create models.
-     */
-    public function create(User $user): bool
-    {
-        return $user->checkPermissionTo('create DuplicateStock');
-    }
-
-    /**
-     * Determine whether the user can update the model.
-     */
-    public function update(User $user, DuplicateStock $duplicatestock): bool
-    {
-        return $user->checkPermissionTo('update DuplicateStock');
-    }
-
-    /**
-     * Determine whether the user can delete the model.
-     */
-    public function delete(User $user, DuplicateStock $duplicatestock): bool
-    {
-        return $user->checkPermissionTo('delete DuplicateStock');
-    }
-
-    /**
-     * Determine whether the user can delete any models.
-     */
-    public function deleteAny(User $user): bool
-    {
-        return $user->checkPermissionTo('delete-any DuplicateStock');
-    }
-
-    /**
-     * Determine whether the user can restore the model.
-     */
-    public function restore(User $user, DuplicateStock $duplicatestock): bool
-    {
-        return $user->checkPermissionTo('restore DuplicateStock');
-    }
-
-    /**
-     * Determine whether the user can restore any models.
-     */
-    public function restoreAny(User $user): bool
-    {
-        return $user->checkPermissionTo('restore-any DuplicateStock');
-    }
-
-    /**
-     * Determine whether the user can replicate the model.
-     */
-    public function replicate(User $user, DuplicateStock $duplicatestock): bool
-    {
-        return $user->checkPermissionTo('replicate DuplicateStock');
-    }
-
-    /**
-     * Determine whether the user can reorder the models.
-     */
-    public function reorder(User $user): bool
-    {
-        return $user->checkPermissionTo('reorder DuplicateStock');
-    }
-
-    /**
-     * Determine whether the user can permanently delete the model.
-     */
-    public function forceDelete(User $user, DuplicateStock $duplicatestock): bool
-    {
-        return $user->checkPermissionTo('force-delete DuplicateStock');
-    }
-
-    /**
-     * Determine whether the user can permanently delete any models.
-     */
-    public function forceDeleteAny(User $user): bool
-    {
-        return $user->checkPermissionTo('force-delete-any DuplicateStock');
-    }
-}

app/Policies/NotInStockPolicy.php

@@ -1,106 +0,0 @@
-<?php
-
-namespace App\Policies;
-
-use Illuminate\Auth\Access\Response;
-use App\Models\NotInStock;
-use App\Models\User;
-
-class NotInStockPolicy
-{
-    /**
-     * Determine whether the user can view any models.
-     */
-    public function viewAny(User $user): bool
-    {
-        return $user->checkPermissionTo('view-any NotInStock');
-    }
-
-    /**
-     * Determine whether the user can view the model.
-     */
-    public function view(User $user, NotInStock $notinstock): bool
-    {
-        return $user->checkPermissionTo('view NotInStock');
-    }
-
-    /**
-     * Determine whether the user can create models.
-     */
-    public function create(User $user): bool
-    {
-        return $user->checkPermissionTo('create NotInStock');
-    }
-
-    /**
-     * Determine whether the user can update the model.
-     */
-    public function update(User $user, NotInStock $notinstock): bool
-    {
-        return $user->checkPermissionTo('update NotInStock');
-    }
-
-    /**
-     * Determine whether the user can delete the model.
-     */
-    public function delete(User $user, NotInStock $notinstock): bool
-    {
-        return $user->checkPermissionTo('delete NotInStock');
-    }
-
-    /**
-     * Determine whether the user can delete any models.
-     */
-    public function deleteAny(User $user): bool
-    {
-        return $user->checkPermissionTo('delete-any NotInStock');
-    }
-
-    /**
-     * Determine whether the user can restore the model.
-     */
-    public function restore(User $user, NotInStock $notinstock): bool
-    {
-        return $user->checkPermissionTo('restore NotInStock');
-    }
-
-    /**
-     * Determine whether the user can restore any models.
-     */
-    public function restoreAny(User $user): bool
-    {
-        return $user->checkPermissionTo('restore-any NotInStock');
-    }
-
-    /**
-     * Determine whether the user can replicate the model.
-     */
-    public function replicate(User $user, NotInStock $notinstock): bool
-    {
-        return $user->checkPermissionTo('replicate NotInStock');
-    }
-
-    /**
-     * Determine whether the user can reorder the models.
-     */
-    public function reorder(User $user): bool
-    {
-        return $user->checkPermissionTo('reorder NotInStock');
-    }
-
-    /**
-     * Determine whether the user can permanently delete the model.
-     */
-    public function forceDelete(User $user, NotInStock $notinstock): bool
-    {
-        return $user->checkPermissionTo('force-delete NotInStock');
-    }
-
-    /**
-     * Determine whether the user can permanently delete any models.
-     */
-    public function forceDeleteAny(User $user): bool
-    {
-        return $user->checkPermissionTo('force-delete-any NotInStock');
-    }
-}

app/Policies/StockDataMasterPolicy.php

@@ -1,106 +0,0 @@
-<?php
-
-namespace App\Policies;
-
-use Illuminate\Auth\Access\Response;
-use App\Models\StockDataMaster;
-use App\Models\User;
-
-class StockDataMasterPolicy
-{
-    /**
-     * Determine whether the user can view any models.
-     */
-    public function viewAny(User $user): bool
-    {
-        return $user->checkPermissionTo('view-any StockDataMaster');
-    }
-
-    /**
-     * Determine whether the user can view the model.
-     */
-    public function view(User $user, StockDataMaster $stockdatamaster): bool
-    {
-        return $user->checkPermissionTo('view StockDataMaster');
-    }
-
-    /**
-     * Determine whether the user can create models.
-     */
-    public function create(User $user): bool
-    {
-        return $user->checkPermissionTo('create StockDataMaster');
-    }
-
-    /**
-     * Determine whether the user can update the model.
-     */
-    public function update(User $user, StockDataMaster $stockdatamaster): bool
-    {
-        return $user->checkPermissionTo('update StockDataMaster');
-    }
-
-    /**
-     * Determine whether the user can delete the model.
-     */
-    public function delete(User $user, StockDataMaster $stockdatamaster): bool
-    {
-        return $user->checkPermissionTo('delete StockDataMaster');
-    }
-
-    /**
-     * Determine whether the user can delete any models.
-     */
-    public function deleteAny(User $user): bool
-    {
-        return $user->checkPermissionTo('delete-any StockDataMaster');
-    }
-
-    /**
-     * Determine whether the user can restore the model.
-     */
-    public function restore(User $user, StockDataMaster $stockdatamaster): bool
-    {
-        return $user->checkPermissionTo('restore StockDataMaster');
-    }
-
-    /**
-     * Determine whether the user can restore any models.
-     */
-    public function restoreAny(User $user): bool
-    {
-        return $user->checkPermissionTo('restore-any StockDataMaster');
-    }
-
-    /**
-     * Determine whether the user can replicate the model.
-     */
-    public function replicate(User $user, StockDataMaster $stockdatamaster): bool
-    {
-        return $user->checkPermissionTo('replicate StockDataMaster');
-    }
-
-    /**
-     * Determine whether the user can reorder the models.
-     */
-    public function reorder(User $user): bool
-    {
-        return $user->checkPermissionTo('reorder StockDataMaster');
-    }
-
-    /**
-     * Determine whether the user can permanently delete the model.
-     */
-    public function forceDelete(User $user, StockDataMaster $stockdatamaster): bool
-    {
-        return $user->checkPermissionTo('force-delete StockDataMaster');
-    }
-
-    /**
-     * Determine whether the user can permanently delete any models.
-     */
-    public function forceDeleteAny(User $user): bool
-    {
-        return $user->checkPermissionTo('force-delete-any StockDataMaster');
-    }
-}

database/migrations/2025_07_30_110725_create_device_masters_table.php

@@ -1,6 +1,7 @@
 <?php
 
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration

database/migrations/2025_09_22_133425_create_class_characteristics_table.php

@@ -105,9 +105,6 @@ return new class extends Migration
                 zmm_tagno                           TEXT DEFAULT NULL,
                 zmm_year                            TEXT DEFAULT NULL,
                 zmm_laser_name                      TEXT DEFAULT NULL,
-                zmm_logo_cp                         TEXT DEFAULT NULL,
-                zmm_logo_ce                         TEXT DEFAULT NULL,
-                zmm_logo_nsf                        TEXT DEFAULT NULL,
                 zmm_beenote                         TEXT DEFAULT NULL,
                 zmm_beenumber                       TEXT DEFAULT NULL,
                 zmm_beestar                         TEXT DEFAULT NULL,
@@ -132,6 +129,9 @@ return new class extends Migration
                 zmm_newt_motor                      TEXT DEFAULT NULL,
                 zmm_newt_pf                         TEXT DEFAULT NULL,
                 zmm_newt_pump                       TEXT DEFAULT NULL,
+                zmm_logo_cp                         TEXT DEFAULT NULL,
+                zmm_logo_ce                         TEXT DEFAULT NULL,
+                zmm_logo_nsf                        TEXT DEFAULT NULL,
                 zmm_packtype                        TEXT DEFAULT NULL,
                 zmm_panel                           TEXT DEFAULT NULL,
                 zmm_performance_factor              TEXT DEFAULT NULL,
@@ -142,35 +142,25 @@ return new class extends Migration
                 zmm_type                            TEXT DEFAULT NULL,
                 zmm_usp                             TEXT DEFAULT NULL,
                 mark_status                         TEXT DEFAULT NULL,
-                marked_datetime                     TIMESTAMP NOT NULL DEFAULT NOW(),
-                marked_physical_count				TEXT DEFAULT '0',
-                marked_expected_time				TEXT DEFAULT '0',
+                marked_datetime                     TIMESTAMP DEFAULT NULL,
                 marked_by                           TEXT DEFAULT NULL,
                 man_marked_status                   TEXT DEFAULT '0',
                 man_marked_datetime                 TIMESTAMP DEFAULT NULL,
                 man_marked_by                       TEXT DEFAULT NULL,
                 motor_marked_status                 TEXT DEFAULT NULL,
-                motor_marked_physical_count         TEXT DEFAULT '0',
-                motor_expected_time                 TEXT DEFAULT '0',
                 motor_marked_by                     TEXT DEFAULT NULL,
                 pump_marked_status                  TEXT DEFAULT NULL,
-                pump_marked_physical_count         	TEXT DEFAULT '0',
-                pump_expected_time                  TEXT DEFAULT '0',
                 pump_marked_by                      TEXT DEFAULT NULL,
-                name_plate_marked_status            TEXT DEFAULT NULL,
-                name_plate_expected_time            TEXT DEFAULT '0',
-                name_plate_marked_by                TEXT DEFAULT NULL,
                 motor_pump_pumpset_status           TEXT DEFAULT NULL,
-                winded_serial_number				TEXT DEFAULT NULL,
                 motor_machine_name                  TEXT DEFAULT NULL,
                 pump_machine_name                   TEXT DEFAULT NULL,
-                name_plate_machine_name             TEXT DEFAULT NULL,
                 pumpset_machine_name                TEXT DEFAULT NULL,
                 part_validation_1                   TEXT DEFAULT NULL,
                 part_validation_2                   TEXT DEFAULT NULL,
                 samlight_logged_name                TEXT DEFAULT NULL,
                 pending_released_status             INTEGER DEFAULT 0,
-                has_work_flow_id					TEXT DEFAULT '0',
+                motor_expected_time                 TEXT DEFAULT '0',
+                pump_expected_time                  TEXT DEFAULT '0',
 
                 created_at							TIMESTAMP NOT NULL DEFAULT NOW(),
                 updated_at							TIMESTAMP NOT NULL DEFAULT NOW(),
@@ -178,7 +168,6 @@ return new class extends Migration
                 updated_by							TEXT DEFAULT NULL,
                 deleted_at			                TIMESTAMP,
 
-                UNIQUE (gernr, plant_id),
                 FOREIGN KEY (plant_id)              REFERENCES  plants (id),
                 FOREIGN KEY (machine_id)            REFERENCES  machines (id),
                 FOREIGN KEY (item_id)               REFERENCES  items (id)

database/migrations/2026_02_26_102939_create_stock_data_masters_table.php

@@ -1,61 +0,0 @@
-<?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
-    {
-        $sql = <<<'SQL'
-            CREATE TABLE stock_data_masters (
-                id					               	BIGINT GENERATED always AS IDENTITY PRIMARY KEY,
-
-                plant_id                            BIGINT NOT NULL,
-                sticker_master_id                   BIGINT NOT NULL,
-                location                            TEXT DEFAULT NULL,
-                bin                                 TEXT DEFAULT NULL,
-                serial_number                       TEXT DEFAULT NULL,
-                batch                               TEXT DEFAULT NULL,
-                quantity                            TEXT DEFAULT NULL,
-                doc_no                              TEXT DEFAULT NULL,
-                type                                TEXT DEFAULT '0',
-                motor_scanned_status                TEXT DEFAULT NULL,
-                pump_scanned_status                 TEXT DEFAULT NULL,
-                capacitor_scanned_status            TEXT DEFAULT NULL,
-                scanned_status_set                  TEXT DEFAULT NULL,
-                panel_box_item_code                 TEXT DEFAULT NULL,
-                panel_box_supplier                  TEXT DEFAULT NULL,
-                panel_box_sno                       TEXT DEFAULT NULL,
-                scanned_status                      TEXT DEFAULT NULL,
-
-                scanned_quantity                    TEXT DEFAULT NULL,
-
-                created_at							TIMESTAMP NOT NULL DEFAULT NOW(),
-                updated_at							TIMESTAMP NOT NULL DEFAULT NOW(),
-                created_by							TEXT DEFAULT NULL,
-                updated_by							TEXT DEFAULT NULL,
-                deleted_at			                TIMESTAMP,
-
-                UNIQUE (plant_id, serial_number),
-
-                FOREIGN KEY (plant_id) REFERENCES plants(id),
-                FOREIGN KEY (sticker_master_id)  REFERENCES  sticker_masters (id)
-            );
-        SQL;
-        DB::statement($sql);
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('stock_data_masters');
-    }
-};
-

database/migrations/2026_03_02_163825_create_not_in_stocks_table.php

@@ -1,60 +0,0 @@
-<?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
-    {
-        $sql = <<<'SQL'
-            CREATE TABLE not_in_stocks (
-                id					               	BIGINT GENERATED always AS IDENTITY PRIMARY KEY,
-
-                plant_id                            BIGINT NOT NULL,
-                sticker_master_id                   BIGINT NOT NULL,
-                location                            TEXT DEFAULT NULL,
-                bin                                 TEXT DEFAULT NULL,
-                serial_number                       TEXT DEFAULT NULL,
-                batch                               TEXT DEFAULT NULL,
-                quantity                            TEXT DEFAULT NULL,
-                doc_no                              TEXT DEFAULT NULL,
-                type                                TEXT DEFAULT '0',
-                motor_scanned_status                TEXT DEFAULT NULL,
-                pump_scanned_status                 TEXT DEFAULT NULL,
-                capacitor_scanned_status            TEXT DEFAULT NULL,
-                scanned_status_set                  TEXT DEFAULT NULL,
-                panel_box_item_code                 TEXT DEFAULT NULL,
-                panel_box_supplier                  TEXT DEFAULT NULL,
-                panel_box_sno                       TEXT DEFAULT NULL,
-                scanned_status                      TEXT DEFAULT NULL,
-
-                scanned_quantity                    TEXT DEFAULT NULL,
-
-                created_at							TIMESTAMP NOT NULL DEFAULT NOW(),
-                updated_at							TIMESTAMP NOT NULL DEFAULT NOW(),
-                created_by							TEXT DEFAULT NULL,
-                updated_by							TEXT DEFAULT NULL,
-                deleted_at			                TIMESTAMP,
-
-                UNIQUE (plant_id, serial_number),
-
-                FOREIGN KEY (plant_id) REFERENCES plants(id),
-                FOREIGN KEY (sticker_master_id)  REFERENCES  sticker_masters (id)
-            );
-        SQL;
-        DB::statement($sql);
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('not_in_stocks');
-    }
-};

database/migrations/2026_03_04_102930_create_duplicate_stocks_table.php

@@ -1,39 +0,0 @@
-<?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
-    {
-        $sql = <<<'SQL'
-            CREATE TABLE duplicate_stocks (
-                id					               	BIGINT GENERATED always AS IDENTITY PRIMARY KEY,
-
-                stock_data_master_id                BIGINT NOT NULL,
-
-                created_at							TIMESTAMP NOT NULL DEFAULT NOW(),
-                updated_at							TIMESTAMP NOT NULL DEFAULT NOW(),
-                created_by							TEXT DEFAULT NULL,
-                updated_by							TEXT DEFAULT NULL,
-                deleted_at			                TIMESTAMP,
-
-                FOREIGN KEY (stock_data_master_id) REFERENCES stock_data_masters(id)
-            );
-        SQL;
-        DB::statement($sql);
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('duplicate_stocks');
-    }
-};

database/migrations/2026_03_19_105145_add_updated_order_quantity_column_to_process_orders.php

@@ -1,31 +0,0 @@
-<?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 process_orders
-        ADD COLUMN updated_order_quantity NUMERIC(10,3) NULL
-        SQL;
-
-        DB::statement($sql1);
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        // Schema::table('process_orders', function (Blueprint $table) {
-        //     //
-        // });
-    }
-};

database/seeders/PermissionSeeder.php

@@ -195,7 +195,5 @@ class PermissionSeeder extends Seeder
         Permission::updateOrCreate(['name' => 'view production target page']);
 
         Permission::updateOrCreate(['name' => 'view wire master print page']);
-        Permission::updateOrCreate(['name' => 'view cycle count page']);
-
     }
 }

resources/views/filament/pages/cycle-count.blade.php

@@ -1,13 +0,0 @@
-<x-filament-panels::page>
-
-<div class="space-y-4">
-    {{-- Render the Select form fields --}}
-    <div class="space-y-4">
-        {{ $this->form }}
-    </div>
-    <div class="bg-white shadow rounded-xl p-4 mt-6">
-        <livewire:stock-data-table />
-    </div>
-</div>
-
-</x-filament-panels::page>

resources/views/filament/pages/dashboard.blade.php

@@ -1,126 +0,0 @@
-<x-filament-panels::page>
-
-    <!-- HEADER -->
-    <div class="mb-8">
-        <h1 class="text-4xl font-bold tracking-tight">
-            CRI Digital Manufacturing IIoT Platform
-        </h1>
-        <p class="text-lg text-gray-600 mt-2">
-            Complete visibility, traceability, and control across your manufacturing operations.
-        </p>
-    </div>
-
-    <!-- BANNER -->
-    {{-- <div class="w-full overflow-hidden rounded-2xl shadow mb-10"> --}}
-    <div class="w-full overflow-hidden rounded-xl shadow">
-        <img
-            src="{{ asset('images/iiot-banner.jpg') }}"
-            alt="CRI Digital Manufacturing IIoT"
-            class="w-full h-72 object-cover"
-        >
-    </div>
-
-    <!-- INTRO -->
-    <div class="max-w-4xl mb-10">
-        <p class="text-lg text-gray-700 mb-4">
-            CRI Digital Manufacturing IIoT is built to deliver
-            <strong>end-to-end traceability, real-time insights, and operational transparency</strong>
-            across plants, lines, and production processes.
-        </p>
-
-        <p class="text-lg text-gray-700">
-            The platform ensures <strong>right quality and on-time delivery</strong> by enabling
-            complete tracking of materials, production orders, and finished goods—helping teams
-            make faster, data-driven decisions with confidence.
-        </p>
-    </div>
-
-    <!-- KEY PILLARS -->
-    <div class="grid grid-cols-1 md:grid-cols-4 gap-6 mb-10">
-        <div class="bg-white rounded-xl border p-6 shadow-sm">
-            <h3 class="text-lg font-semibold mb-2">🔍 Traceability</h3>
-            <p class="text-gray-600">
-                Track materials, batches, and serials from input to dispatch.
-            </p>
-        </div>
-
-        <div class="bg-white rounded-xl border p-6 shadow-sm">
-            <h3 class="text-lg font-semibold mb-2">✅ Quality Assurance</h3>
-            <p class="text-gray-600">
-                Validate process data and ensure first-time-right production.
-            </p>
-        </div>
-
-        <div class="bg-white rounded-xl border p-6 shadow-sm">
-            <h3 class="text-lg font-semibold mb-2">⏱ On-Time Delivery</h3>
-            <p class="text-gray-600">
-                Identify delays early and meet production commitments.
-            </p>
-        </div>
-
-        <div class="bg-white rounded-xl border p-6 shadow-sm">
-            <h3 class="text-lg font-semibold mb-2">📊 Real-Time Insights</h3>
-            <p class="text-gray-600">
-                Monitor performance and take quick corrective actions.
-            </p>
-        </div>
-    </div>
-
-    <!-- SUPPORT -->
-    <div class="bg-white rounded-xl border p-6 shadow-sm">
-        <h2 class="text-2xl font-semibold mb-3">24×7 Support</h2>
-        <p class="text-gray-700 mb-2">
-            Our dedicated IIoT support team is available round-the-clock to ensure
-            uninterrupted operations and quick issue resolution.
-        </p>
-        <p class="text-lg font-medium text-gray-900">
-            📞 Support Landline: <span class="font-semibold">0422 711 7179</span>
-        </p>
-        {{-- <p class="text-lg font-medium text-gray-900">
-            📞 Technical Support Contact: <span class="font-semibold">9952468104 / 9100832269</span>
-        </p> --}}
-    </div>
-
-    {{-- <div class="bg-white rounded-xl border p-6 shadow-sm">
-    <h2 class="text-2xl font-semibold mb-4">24×7 Support</h2>
-
-    <p class="text-lg text-gray-700 mb-4">
-        Our support structure is designed to ensure quick resolution based on the type
-        of issue — whether it is on-site, application-related, or infrastructure-related.
-    </p>
-
-    <div class="space-y-3">
-
-        <p class="text-lg font-medium text-gray-900">
-            🏭 <strong>Plant & On-Site Support</strong> <br>
-            <span class="text-gray-700">
-                For plant visits, industry-level issues, and on-ground validation
-            </span><br>
-            📞 <span class="font-semibold">8925899458 / 8925899459</span>
-        </p>
-
-        <p class="text-lg font-medium text-gray-900">
-            💻 <strong>Application & Logic Support</strong> <br>
-            <span class="text-gray-700">
-                For website errors, logic issues, and application-level problems
-            </span><br>
-            📞 <span class="font-semibold">9952468104 / 9100832269</span>
-        </p>
-    </div>
-</div> --}}
-
-
-    <!-- TEAM -->
-    {{-- <div class="bg-white rounded-xl border p-6 shadow-sm">
-        <h2 class="text-2xl font-semibold mb-4">IIOT Team Members</h2>
-        <div class="grid grid-cols-2 md:grid-cols-3 gap-4 text-gray-700">
-            <div class="flex items-center gap-2">👤 Jothikumar</div>
-            <div class="flex items-center gap-2">👤 Jeithef Shibu</div>
-            <div class="flex items-center gap-2">👤 Dhanabalan</div>
-            <div class="flex items-center gap-2">👤 Ranjith</div>
-            <div class="flex items-center gap-2">👤 Srimathy</div>
-            <div class="flex items-center gap-2">👤 Gokul</div>
-        </div>
-    </div> --}}
-
-</x-filament-panels::page>

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

@@ -87,15 +87,6 @@
         }
     });
 
-    window.addEventListener('focus-qr-input', () => {
-        const input = document.getElementById('qr-scan-input');
-
-        if (input) {
-            input.focus();
-            input.select();
-        }
-    });
-
     document.addEventListener('DOMContentLoaded', function () {
         const scanInput = document.getElementById('qr-scan-input');
         if (!scanInput) return;
@@ -106,10 +97,10 @@
 
                 const value = scanInput.value.trim();
 
-                // if (value != '') {
+                if (value !== '') {
                     Livewire.dispatch('handleQrScan', { value: value });
                     scanInput.value = '';
-                // }
+                }
             }
         });
 

resources/views/filament/pages/sticker-reprint.blade.php

@@ -34,33 +34,22 @@
 </div>
 
 
-
 @push('scripts')
 <script>
-
-    window.addEventListener('focus-qr-input', () => {
-        const input = document.getElementById('qr-scan-input');
-
-        if (input) {
-            input.focus();
-            input.select();
-        }
-    });
-
     document.addEventListener('DOMContentLoaded', function () {
         const scanInput = document.getElementById('qr-scan-input');
         if (!scanInput) return;
 
         scanInput.addEventListener('keydown', function (event) {
-            if (event.key == 'Enter') {
+            if (event.key === 'Enter') {
                 event.preventDefault();
 
                 const value = scanInput.value.trim();
 
-                //if (value !== '') {
+                if (value !== '') {
                     Livewire.dispatch('handleQrScan', { value: value });
                     scanInput.value = '';
-                //}
+                }
             }
         });
         window.addEventListener('open-pdf', event => {

resources/views/filament/pages/welcome.blade.php

@@ -1,13 +1,126 @@
 <x-filament-panels::page>
-    <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-2 sm:gap-4 md:gap-4 p-2 md:p-4 items-start">
-        {{-- Filters form --}}
-        <div class="space-y-4 w-full max-w-full col-span-1">
-            {{ $this->filtersForm($this->form) }}
+
+    <!-- HEADER -->
+    <div class="mb-8">
+        <h1 class="text-4xl font-bold tracking-tight">
+            CRI Digital Manufacturing IIoT Platform
+        </h1>
+        <p class="text-lg text-gray-600 mt-2">
+            Complete visibility, traceability, and control across your manufacturing operations
+        </p>
     </div>
 
-        {{-- Stat widget --}}
-        <div class="w-full max-w-full col-span-1 sm:col-span-1 lg:col-span-2">
-            @livewire(\App\Filament\Widgets\CumulativeChart::class)
+    <!-- BANNER -->
+    {{-- <div class="w-full overflow-hidden rounded-2xl shadow mb-10"> --}}
+    <div class="w-full overflow-hidden rounded-xl shadow">
+        <img
+            src="{{ asset('images/iiot-banner.jpg') }}"
+            alt="CRI Digital Manufacturing IIoT"
+            class="w-full h-72 object-cover"
+        >
+    </div>
+
+    <!-- INTRO -->
+    <div class="max-w-4xl mb-10">
+        <p class="text-lg text-gray-700 mb-4">
+            CRI Digital Manufacturing IIoT is built to deliver
+            <strong>end-to-end traceability, real-time insights, and operational transparency</strong>
+            across plants, lines, and production processes.
+        </p>
+
+        <p class="text-lg text-gray-700">
+            The platform ensures <strong>right quality and on-time delivery</strong> by enabling
+            complete tracking of materials, production orders, and finished goods—helping teams
+            make faster, data-driven decisions with confidence.
+        </p>
+    </div>
+
+    <!-- KEY PILLARS -->
+    <div class="grid grid-cols-1 md:grid-cols-4 gap-6 mb-10">
+        <div class="bg-white rounded-xl border p-6 shadow-sm">
+            <h3 class="text-lg font-semibold mb-2">🔍 Traceability</h3>
+            <p class="text-gray-600">
+                Track materials, batches, and serials from input to dispatch.
+            </p>
+        </div>
+
+        <div class="bg-white rounded-xl border p-6 shadow-sm">
+            <h3 class="text-lg font-semibold mb-2">✅ Quality Assurance</h3>
+            <p class="text-gray-600">
+                Validate process data and ensure first-time-right production.
+            </p>
+        </div>
+
+        <div class="bg-white rounded-xl border p-6 shadow-sm">
+            <h3 class="text-lg font-semibold mb-2">⏱ On-Time Delivery</h3>
+            <p class="text-gray-600">
+                Identify delays early and meet production commitments.
+            </p>
+        </div>
+
+        <div class="bg-white rounded-xl border p-6 shadow-sm">
+            <h3 class="text-lg font-semibold mb-2">📊 Real-Time Insights</h3>
+            <p class="text-gray-600">
+                Monitor performance and take quick corrective actions.
+            </p>
         </div>
     </div>
+
+    <!-- SUPPORT -->
+    <div class="bg-white rounded-xl border p-6 shadow-sm">
+        <h2 class="text-2xl font-semibold mb-3">24×7 Support</h2>
+        <p class="text-gray-700 mb-2">
+            Our dedicated IIoT support team is available round-the-clock to ensure
+            uninterrupted operations and quick issue resolution.
+        </p>
+        <p class="text-lg font-medium text-gray-900">
+            📞 Support Landline: <span class="font-semibold">0422 711 7179</span>
+        </p>
+        {{-- <p class="text-lg font-medium text-gray-900">
+            📞 Technical Support Contact: <span class="font-semibold">9952468104 / 9100832269</span>
+        </p> --}}
+    </div>
+
+    {{-- <div class="bg-white rounded-xl border p-6 shadow-sm">
+    <h2 class="text-2xl font-semibold mb-4">24×7 Support</h2>
+
+    <p class="text-lg text-gray-700 mb-4">
+        Our support structure is designed to ensure quick resolution based on the type
+        of issue — whether it is on-site, application-related, or infrastructure-related.
+    </p>
+
+    <div class="space-y-3">
+
+        <p class="text-lg font-medium text-gray-900">
+            🏭 <strong>Plant & On-Site Support</strong> <br>
+            <span class="text-gray-700">
+                For plant visits, industry-level issues, and on-ground validation
+            </span><br>
+            📞 <span class="font-semibold">8925899458 / 8925899459</span>
+        </p>
+
+        <p class="text-lg font-medium text-gray-900">
+            💻 <strong>Application & Logic Support</strong> <br>
+            <span class="text-gray-700">
+                For website errors, logic issues, and application-level problems
+            </span><br>
+            📞 <span class="font-semibold">9952468104 / 9100832269</span>
+        </p>
+    </div>
+</div> --}}
+
+
+    <!-- TEAM -->
+    {{-- <div class="bg-white rounded-xl border p-6 shadow-sm">
+        <h2 class="text-2xl font-semibold mb-4">IIOT Team Members</h2>
+        <div class="grid grid-cols-2 md:grid-cols-3 gap-4 text-gray-700">
+            <div class="flex items-center gap-2">👤 Jothikumar</div>
+            <div class="flex items-center gap-2">👤 Jeithef Shibu</div>
+            <div class="flex items-center gap-2">👤 Dhanabalan</div>
+            <div class="flex items-center gap-2">👤 Ranjith</div>
+            <div class="flex items-center gap-2">👤 Srimathy</div>
+            <div class="flex items-center gap-2">👤 Gokul</div>
+        </div>
+    </div> --}}
+
 </x-filament-panels::page>

resources/views/livewire/stock-data-table.blade.php

@@ -1,308 +0,0 @@
-<div>
-    <div class="mb-4">
-        <h2 class="text-lg font-bold text-gray-800">
-            @if ($hasSearched)
-                FG STOCK DATA TABLE
-            @elseif ($isSfg)
-                SFG STOCK DATA TABLE
-            @elseif ($isnonQuanSfg)
-                SFG STOCK DATA TABLE
-            @else
-                STOCK DATA TABLE
-            @endif
-        </h2>
-
-    </div>
-
-    <div class="mt-2">
-        <hr class="border-t-2 border-gray-300">
-    </div>
-
-
-    @if ($hasSearched)
-    <div class="overflow-x-auto" style="height: 385px;">
-        <table class="min-w-full text-sm text-center border border-gray-300">
-            <table class="table-fixed min-w-[1500px] text-sm text-center border border-gray-300">
-                <thead class="bg-gray-100 font-bold">
-                <tr>
-                    <th class="border px-4 py-2">No</th>
-                    <th class="border px-4 py-2">Material Code</th>
-                    <th class="border px-4 py-2">Serial Number</th>
-                    <th class="border px-4 py-2">Motor Scanned Status</th>
-                    <th class="border px-4 py-2">Pump Scanned Status</th>
-                    <th class="border px-4 py-2">Scanned Status Set</th>
-                    <th class="border px-4 py-2">Scanned Status</th>
-                    <th class="border px-4 py-2 w-[300px] whitespace-nowrap">Time Stamp</th>
-                    <th class="border px-4 py-2">Operator ID</th>
-                </tr>
-            </thead>
-
-            <tbody>
-                @forelse ($records as $index => $record)
-                    <tr wire:key="inv-{{ $record->id }}" class="border-t">
-                        <td class="border px-2 py-2">{{ $records->firstItem() + $index }}</td>
-                        <td class="border px-2 py-2">{{ $record->stickerMasterRelation?->item?->code ?? 'N/A' }}</td>
-                        <td class="border px-2 py-2">{{ $record->serial_number ?? 'N/A' }}</td>
-                        <td class="border px-2 py-2">{{ $record->motor_scanned_status ? '1' : '' }}</td>
-                        <td class="border px-2 py-2">{{ $record->pump_scanned_status ? '1' : '' }}</td>
-                        <td class="border px-2 py-2">{{ $record->scanned_status_set ? '1' : '' }}</td>
-                        <td class="border px-2 py-2">{{ $record->scanned_status ?? '' }}</td>
-                        <td class="border px-2 py-2 whitespace-nowrap">{{ optional($record->created_at)->format('d-m-Y H:i:s') }}</td>
-                        <td class="border px-2 py-2">{{ $record->updated_by ?? '' }}</td>
-                    </tr>
-                @empty
-                    <tr>
-                        <td colspan="12" class="py-4 text-gray-500">
-                            No scanned data found for location <strong>{{ $location }}</strong>
-                        </td>
-                    </tr>
-                @endforelse
-            </tbody>
-        </table>
-        {{-- <div class="mt-3 flex justify-center">
-            {{ $records->onEachSide(3)->links() }}
-        </div> --}}
-    </div>
-    @endif
-
-    @if($isSfg)
-
-        <div class="w-full overflow-x-auto" style="height:385px">
-
-            <table class="w-full text-sm text-center border border-gray-300">
-
-                    <thead class="bg-gray-100 font-bold">
-                    <tr>
-                        <th class="border px-4 py-2">No</th>
-                        <th class="border px-4 py-2">Location</th>
-                        <th class="border px-4 py-2">Bin</th>
-                        <th class="border px-4 py-2">Item Code</th>
-                        <th class="border px-4 py-2">Serial Number</th>
-                        <th class="border px-4 py-2">Batch</th>
-                        <th class="border px-4 py-2">Document Number</th>
-                        <th class="border px-4 py-2">Total Quantity</th>
-                        <th class="border px-4 py-2">Scanned Quantity</th>
-                        <th class="border px-4 py-2">Operator ID</th>
-                    </tr>
-                    </thead>
-
-                <tbody>
-
-                    @forelse($scannedSfgData as $index => $row)
-
-                        <tr>
-                            <td class="border px-3 py-2">{{ $index+1 }}</td>
-                            <td class="border px-3 py-2">{{ $row['location'] }}</td>
-                            <td class="border px-3 py-2">{{ $row['bin'] }}</td>
-                            <td class="border px-3 py-2">{{ $row['item_code'] }}</td>
-                            <td class="border px-3 py-2">{{ $row['serial_number'] }}</td>
-                            <td class="border px-3 py-2">{{ $row['batch'] }}</td>
-                            <td class="border px-3 py-2">{{ $row['doc_no'] }}</td>
-                            <td class="border px-3 py-2">{{ $row['quantity'] }}</td>
-                            <td class="border px-3 py-2">{{ $row['scanned_quantity'] }}</td>
-                            <td class="border px-3 py-2">{{ $row['updated_by'] }}</td>
-                        </tr>
-
-                        @empty
-                        <tr>
-                            <td colspan="10" class="py-4 text-gray-500">
-                                No scanned SFG data
-                            </td>
-                        </tr>
-                    @endforelse
-                </tbody>
-            </table>
-        </div>
-    @endif
-
-    @if($isnonQuanSfg)
-
-        <div class="w-full overflow-x-auto" style="height:385px">
-
-            <table class="w-full text-sm text-center border border-gray-300">
-
-                    <thead class="bg-gray-100 font-bold">
-                    <tr>
-                        <th class="border px-4 py-2">No</th>
-                        <th class="border px-4 py-2">Location</th>
-                        <th class="border px-4 py-2">Bin</th>
-                        <th class="border px-4 py-2">Item Code</th>
-                        <th class="border px-4 py-2">Serial Number</th>
-                        <th class="border px-4 py-2">Batch</th>
-                        <th class="border px-4 py-2">Document Number</th>
-                        <th class="border px-4 py-2">Total Quantity</th>
-                        <th class="border px-4 py-2">Scanned Quantity</th>
-                        <th class="border px-4 py-2">Operator ID</th>
-                    </tr>
-                    </thead>
-
-                <tbody>
-
-                    @forelse($scannedSerials as $index => $row)
-
-                        <tr>
-                            <td class="border px-3 py-2">{{ $index+1 }}</td>
-                            <td class="border px-3 py-2">{{ $row['location'] }}</td>
-                            <td class="border px-3 py-2">{{ $row['bin'] }}</td>
-                            <td class="border px-3 py-2">{{ $row['item_code'] }}</td>
-                            <td class="border px-3 py-2">{{ $row['serial_number'] }}</td>
-                            <td class="border px-3 py-2">{{ $row['batch'] }}</td>
-                            <td class="border px-3 py-2">{{ $row['doc_no'] }}</td>
-                            <td class="border px-3 py-2">{{ $row['quantity'] }}</td>
-                            <td class="border px-3 py-2">{{ $row['scanned_quantity'] }}</td>
-                            <td class="border px-3 py-2">{{ $row['updated_by'] }}</td>
-                        </tr>
-
-                        @empty
-                        <tr>
-                            <td colspan="10" class="py-4 text-gray-500">
-                                No scanned SFG data
-                            </td>
-                        </tr>
-                    @endforelse
-                </tbody>
-            </table>
-        </div>
-    @endif
-
-    {{-- Modal for Capacitor Input --}}
-    <div>
-        <button wire:click="$set('showCapacitorInput', true)"></button>
-        @if($showCapacitorInput)
-            <div class="fixed inset-0 z-[9999] bg-black bg-opacity-50 flex items-center justify-center">
-                <div style="background:white; border:4px solid orange;" class="p-6 rounded-xl shadow-2xl w-[450px]">
-                    <h3 class="text-xl font-semibold text-orange-700 mb-4">
-                        Scan the Panel Box Supplier/Item Code/Serial Number
-                    </h3>
-
-                    <input
-                        type="text"
-                        id="capacitorInput"
-                        autocomplete="off"
-                        wire:model.defer="capacitorInput"
-                        wire:keydown.enter.prevent="processCapacitorInput"
-                        class="w-full border border-orange-300 rounded px-3 py-2 focus:outline-none focus:ring-0 focus:border-orange-300"
-                        placeholder="Scan the panel box QR code"
-                        {{-- autofocus --}}
-                        onload="this.focus(); this.select();"
-                        {{-- onfocus="this.select();" --}}
-                    />
-
-                    <div class="flex justify-end gap-2 mt-4">
-                        <button type="button" wire:click="cancelCapacitorInput"
-                        class="mt-6 ml-10 bg-gray-300 hover:bg-gray-400 px-4 py-2 rounded transition">
-                            Cancel
-                        </button>
-                    </div>
-                </div>
-            </div>
-            {{-- Add this script to focus on the input --}}
-            <script>
-                document.getElementById('capacitorInput').focus();
-            </script>
-            {{-- <script>
-                document.addEventListener('livewire:initialized', () => {
-                    @this.on('focus-capacitor-input', () => {
-                        setTimeout(() => {
-                            const el = document.getElementById('capacitorInput');
-                            if (el) el.focus();
-                        }, 100);
-                    });
-                });
-            </script> --}}
-        @endif
-    </div>
-
-    {{-- Modal for material invoice--}}
-    @if($materialInvoice)
-        {{-- <div class="flex justify-center overflow-x-auto overflow-y-visible" style="height: 385px;"> --}}
-        <div class="overflow-x-auto overflow-y-visible" style="height: 385px;">
-            {{-- <table class="min-w-full text-sm text-center border border-gray-300"> --}}
-            <table class="min-w-full mx-auto text-sm text-center border border-gray-300">
-                <thead class="bg-gray-100 font-bold">
-                    <tr>
-                        <th class="border px-4 py-2">No</th>
-                        <th class="border px-4 py-2">Material Code</th>
-                        <th class="border px-4 py-2">Material Type</th>
-                        <th class="border px-4 py-2">Material Quantity</th>
-                        <th class="border px-4 py-2">Serial Number</th>
-                        <th class="border px-4 py-2">Batch Number</th>
-                        <th class="border px-4 py-2">TimeStamp</th>
-                        <th class="border px-4 py-2">Operator ID</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    @forelse ($invoiceData as $index => $row)
-                        <tr class="border-t">
-                            <td class="border px-4 py-2">{{ $index + 1 }}</td>
-                            <td class="border px-4 py-2">{{ $row['code'] ?? 'N/A' }}</td>
-                            <td class="border px-4 py-2">{{ $row['material_type'] ?? 'N/A' }}</td>
-                            <td class="border px-4 py-2">
-                                @if(($row['material_type'] ?? '') === 'Individual' || ($row['material_type'] ?? '') === 'Bundle')
-                                    {{ number_format((float)($row['quantity'] ?? 0), 0) }}
-                                @else
-                                    {{ $row['quantity'] ?? 'N/A' }}
-                                @endif
-                            </td>
-                            <td class="border px-4 py-2">{{ $row['serial_number'] ?? 'N/A' }}</td>
-                            <td class="border px-4 py-2">{{ $row['batch_number'] ?? 'N/A' }}</td>
-                            <td class="border px-4 py-2">{{ $row['created_at'] ?? 'N/A' }}</td>
-                            <td class="border px-4 py-2">{{ $row['operator_id'] ?? 'N/A' }}</td>
-                        </tr>
-                    @empty
-                        <tr>
-                            <td colspan="10" class="text-center py-4 text-gray-500">
-                                No data found for invoice number <strong>{{ $invoiceNumber }}</strong>.
-                            </td>
-                        </tr>
-                    @endforelse
-                </tbody>
-            </table>
-        </div>
-    @endif
-</div>
-{{-- <script>
-    // Clear input and set focus on form load
-    document.addEventListener('DOMContentLoaded', function () {
-        const input = document.getElementById('capacitorInput');
-        input.value = ''; // Clear the input field
-        input.focus(); // Set focus to the input field
-    });
-</script> --}}
-<script>
-    window.addEventListener('focus-capacitor-input', () => {
-        setTimeout(() => {
-            const input = document.getElementById('capacitorInput');
-            if (input) {
-                input.focus();
-                input.select();
-            }
-        }, 50);
-    });
-
-    window.addEventListener('focus-serial-number', () => {
-        setTimeout(() => {
-            const container = document.getElementById('serial_number_input');
-            const input = container?.querySelector('input'); // gets the actual input inside
-
-            if (input) {
-                input.focus();
-                input.select();
-            }
-        }, 50);
-    });
-
-    window.addEventListener('focus-invoice-number', () => {
-        setTimeout(() => {
-            const container = document.getElementById('invoice_number_input');
-            const input = container?.querySelector('input'); // gets the actual input inside
-
-            if (input) {
-                input.focus();
-                input.select();
-            }
-        }, 50);
-    });
-</script>
-
-

routes/api.php

@@ -136,13 +136,9 @@ Route::post('serial-invoice/store-data', [InvoiceValidationController::class, 's
 
 Route::post('material-invoice/store-data', [InvoiceValidationController::class, 'materialInvoice']);
 
-// User Controller
-
-Route::get('user/get-data', [UserController::class, 'get_user_data']);
-
 // Testing panel Controller
 
-Route::get('testing/user/get-data', [UserController::class, 'get_user_data']);
+Route::get('testing/user/get-data', [UserController::class, 'get_testing_data']);
 
 Route::get('testing/item/get-master-data', [TestingPanelController::class, 'get_motor_master']);
 
@@ -174,7 +170,7 @@ Route::get('laser/characteristics/check', [CharacteristicsController::class, 'ch
 
 Route::post('laser/characteristics/data', [CharacteristicsController::class, 'storeClassChar']);
 
-// ..Marked serial (auto or manual)
+// ..serial (auto or manual)
 
 Route::post('laser/characteristics/status', [CharacteristicsController::class, 'storeLaserStatus']);