Merge pull request 'Added rework_status value validation on importer' (#377) from ranjith-dev into master

Reviewed-on: #377

app/Filament/Imports/ProcessOrderImporter.php

@@ -142,13 +142,12 @@ class ProcessOrderImporter extends Importer
         if ($recQuan == null || $recQuan == '') {
             $recQuan = 0;
         }
-        if ($reworkStatus == null || $reworkStatus = '') {
+        if ($reworkStatus == null || $reworkStatus = '' || $reworkStatus == 0 || $reworkStatus = '0') {
             $reworkStatus = 0;
-        }
-
-        if ($createdBy == null || $createdBy == '') {
-            $createdBy = Filament::auth()->user()?->name;
-            $updatedBy = $createdBy;
+        } elseif ($reworkStatus == 1 || $reworkStatus = '1') {
+            $reworkStatus = 1;
+        } else {
+            $warnMsg[] = 'Invalid rework status found';
         }
 
         if (Str::length($plantCod) < 4 || ! is_numeric($plantCod) || ! preg_match('/^[1-9]\d{3,}$/', $plantCod)) {
@@ -209,21 +208,14 @@ class ProcessOrderImporter extends Importer
             $lineId = null;
         }
 
-        if ($createdBy != null && $createdBy != '') {
-            if ($plantId) {
-                $user = User::where('name', $createdBy)->first();
+        // $user = User::where('name', $this->data['created_by'])->first();
+        // if (! $user) {
+        //     $warnMsg[] = 'User not found';
+        // }
 
-                $userPlant = User::where('name', $createdBy)->where('plant_id', $plantId)->first();
-
-                if (! $user) {
-                    $warnMsg[] = 'Created By user name not found!';
-                } elseif (! $userPlant && ! $user->hasRole('Super Admin')) {
-                    $warnMsg[] = "Created By user '{$createdBy}' not found for Plant '{$plantCod}'!";
-                } elseif (! $user->hasRole(['Super Admin', 'Process Quality Manager', 'Process Manager', 'Process Supervisor', 'Process Employee'])) {
-                    $warnMsg[] = 'Created By user does not have rights!';
-                }
-            }
-            $updatedBy = Filament::auth()->user()?->name;
+        if (! $createdBy) {
+            $createdBy = Filament::auth()->user()->name;
+            $updatedBy = Filament::auth()->user()->name;
         }
 
         if (! empty($warnMsg)) {
@@ -280,9 +272,10 @@ class ProcessOrderImporter extends Importer
                 ->where('coil_number', $coilNo)
                 ->first();
 
-            if (! $existing && $coilNo == '0' || $coilNo == 0) {
+            if (! $existing && ($coilNo == '0' || $coilNo == 0)) {
                 ProcessOrder::create([
                     'plant_id' => $plantId,
+                    'line_id' => $lineId,
                     'item_id' => $itemId,
                     'process_order' => $processOrder,
                     'coil_number' => '0',
@@ -297,8 +290,8 @@ class ProcessOrderImporter extends Importer
                     [
                         'plant_id' => $plantId,
                         'line_id' => $lineId,
-                        'process_order' => $processOrder,
                         'item_id' => $itemId,
+                        'process_order' => $processOrder,
                         'coil_number' => $coilNo,
                         'order_quantity' => $orderQuan,
                         'received_quantity' => $recQuan,
@@ -306,13 +299,17 @@ class ProcessOrderImporter extends Importer
                         'sfg_number' => $sfgNo,
                         'machine_name' => $machineName,
                         'rework_status' => $reworkStatus,
-                        'created_at' => $createdAt,
-                        'updated_at' => $updatedAt,
+                        // 'created_at' => $createdAt,
+                        // 'updated_at' => $updatedAt,
                         'created_by' => $createdBy,
                         'updated_by' => $updatedBy,
                     ]
                 );
             } else {// $coilNo = '0'
+                if ($existing->rework_status == 1 && $reworkStatus == 0) {
+                    throw new RowImportFailedException('Rework coil number already exist for the given Plant and Process Order!');
+                }
+
                 ProcessOrder::where('plant_id', $plantId)
                     ->where('process_order', $processOrder)
                     ->where('coil_number', $coilNo)
@@ -324,7 +321,7 @@ class ProcessOrderImporter extends Importer
                         // 'machine_name'      => $machineId,
                         'rework_status' => $reworkStatus,
                         'updated_by' => $updatedBy,
-                        'updated_at' => $updatedAt,
+                        // 'updated_at' => $updatedAt,
                     ]);
             }
         }

app/Filament/Pages/ProductionTarget.php

@@ -31,47 +31,6 @@ class ProductionTarget extends Page
             ->schema([
                 Section::make('')
                     ->schema([
-                        Select::make('plant_id')
-                            ->label('Plant')
-                            ->relationship('plant', 'name')
-                            ->reactive()
-                            // ->searchable()
-                            ->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();
-                            })
-                            ->required()
-                            ->afterStateUpdated(function ($state, callable $get, $set) {
-                                // dd($state);
-                                $set('line_id', null);
-                                $set('year', null);
-                                $set('month', null);
-                                $this->dispatch('loadData',$state, '', '', '');
-                            }),
-                        Select::make('line_id')
-                            ->label('Line')
-                            ->required()
-                            ->relationship('line', 'name')
-                            // ->searchable()
-                            ->columnSpan(1)
-                            ->options(function (callable $get) {
-                                if (!$get('plant_id')) {
-                                    return [];
-                                }
-
-                                return \App\Models\Line::where('plant_id', $get('plant_id'))
-                                    ->pluck('name', 'id')
-                                    ->toArray();
-                            })
-                            ->reactive()
-                            ->afterStateUpdated(function ($state, callable $get, $set) {
-                                $plantId = $get('plant_id');
-
-
-                                $set('year', null);
-                                $set('month', null);
-                                $this->dispatch('loadData',$plantId, $state, '', '');
-                            }),
                         Select::make('year')
                             ->label('Year')
                             ->reactive()
@@ -97,9 +56,13 @@ class ProductionTarget extends Page
                             ->required()
                             ->afterStateUpdated(function ($state, callable $get, $set) {
                                 $set('month', null);
+                                $set('plant_id', null);
+                                $set('line_id', null);
+                                $set('category', null);
                                 $plantId = $get('plant_id');
                                 $lineId = $get('line_id');
-                                $this->dispatch('loadData',$plantId, $lineId, $state, '');
+                                // $this->dispatch('loadData',$plantId, $lineId, $state, '');
+                                $this->dispatch('loadData',$state, '', '', '', '');
                             }),
 
                         Select::make('month')
@@ -121,23 +84,86 @@ class ProductionTarget extends Page
                                 '12' => 'December',
                             ])
                             ->required()
-                            ->afterStateUpdated(function ($state, callable $get) {
+                            ->afterStateUpdated(function ($state, callable $get, $set) {
 
+                                $set('plant_id', null);
+                                $set('line_id', null);
+                                $set('category', null);
+
+                                $year = $get('year');
+
+                                $this->dispatch('loadData',$year, $state, '', '', '');
+
+                                // $plantId = $get('plant_id');
+                                // $lineId = $get('line_id');
+                                // // $month = $get('month');
+                                // $year = $get('year');
+
+                                // $month = (int) $get('month');
+
+                                // if (!$month) {
+                                //     return;
+                                // }
+                                // $this->dispatch('loadData', $plantId, $lineId, $month, $year);
+                            }),
+                        Select::make('plant_id')
+                            ->label('Plant')
+                            ->relationship('plant', 'name')
+                            ->reactive()
+                            // ->searchable()
+                            ->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();
+                            })
+                            ->required()
+                            ->afterStateUpdated(function ($state, callable $get, $set) {
+                                // dd($state);
+                                $set('line_id', null);
+                                $set('category', null);
+                                $this->dispatch('loadData',$state, '', '', '', '');
+                            }),
+                        Select::make('line_id')
+                            ->label('Line')
+                            ->required()
+                            ->relationship('line', 'name')
+                            // ->searchable()
+                            ->columnSpan(1)
+                            ->options(function (callable $get) {
+                                if (!$get('plant_id')) {
+                                    return [];
+                                }
+
+                                return \App\Models\Line::where('plant_id', $get('plant_id'))
+                                    ->pluck('name', 'id')
+                                    ->toArray();
+                            })
+                            ->reactive()
+                            ->afterStateUpdated(function ($state, callable $get, $set) {
                                 $plantId = $get('plant_id');
                                 $lineId = $get('line_id');
                                 // $month = $get('month');
                                 $year = $get('year');
 
                                 $month = (int) $get('month');
+                                $this->dispatch('loadData',$year, $month, $plantId, $lineId, '');
+                            }),
 
-                                if (!$month) {
-                                    return;
-                                }
-                                $this->dispatch('loadData', $plantId, $lineId, $month, $year);
+                        TextInput::make('category')
+                            ->label('Category')
+                            ->reactive()
+                            ->afterStateUpdated(function ($state, callable $get, $set) {
+                                $plantId = $get('plant_id');
+                                $lineId = $get('line_id');
+                                // $month = $get('month');
+                                $year = $get('year');
+
+                                $month = (int) $get('month');
+                                $category = $get('category');
+                                $this->dispatch('loadData',$year, $month, $plantId, $lineId, $category);
                             }),
 
                     ])
-                    ->columns(4)
+                    ->columns(5)
             ]);
     }
 

app/Filament/Resources/GrMasterResource.php

@@ -446,7 +446,7 @@ class GrMasterResource extends Resource
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('item.code')
-                    ->label('Item Code')
+                    ->label('Item')
                     ->searchable()
                     ->alignCenter()
                     ->sortable(),

app/Filament/Resources/ProductionPlanResource.php

@@ -48,6 +48,7 @@ class ProductionPlanResource extends Resource
                 Section::make('')
                     ->schema([
                         Forms\Components\Select::make('plant_id')
+                            ->label('Plant')
                             ->relationship('plant', 'name')
                             ->required()
                             // ->nullable()
@@ -79,6 +80,7 @@ class ProductionPlanResource extends Resource
                             ->hint(fn ($get) => $get('ppPlantError') ? $get('ppPlantError') : null)
                             ->hintColor('danger'),
                         Forms\Components\Select::make('line_id')
+                            ->label('Line')
                             ->relationship('line', 'name')
                             ->required()
                             // ->nullable()
@@ -437,7 +439,7 @@ class ProductionPlanResource extends Resource
                     ->sortable()
                     ->searchable(),
                 Tables\Columns\TextColumn::make('line.name')
-                    ->label('Plant')
+                    ->label('Line')
                     ->alignCenter()
                     ->sortable()
                     ->searchable(),

app/Livewire/ProductionTargetPlan.php

@@ -26,6 +26,7 @@ class ProductionTargetPlan extends Component
 
     protected $listeners = [
         'loadData' => 'loadProductionData',
+        'loadCategoryData' => 'loadProductionDataCategory',
         'loadData1' => 'exportProductionData',
     ];
 
@@ -175,7 +176,7 @@ class ProductionTargetPlan extends Component
 
 
 
-    public function loadProductionData($plantId, $lineId, $month, $year)
+    public function loadProductionData($year, $month, $plantId, $lineId, $category)
     {
         if (!$plantId || !$lineId || !$month || !$year) {
             $this->records = [];
@@ -195,6 +196,9 @@ class ProductionTargetPlan extends Component
             ->where('production_plans.line_id', $lineId)
             ->whereMonth('production_plans.created_at', $month)
             ->whereYear('production_plans.created_at', $year)
+            ->when($category, function ($query) use ($category) {
+                $query->where('items.category', $category);
+            })
             ->select(
                 'production_plans.item_id',
                 'production_plans.plant_id',
@@ -203,6 +207,7 @@ class ProductionTargetPlan extends Component
                 'production_plans.working_days',
                 'production_plans.leave_dates',
                 'items.code as item_code',
+                'items.category as category',
                 'items.description as item_description',
                 'lines.name as line_name',
                 'lines.line_capacity as line_capacity',
@@ -229,6 +234,11 @@ class ProductionTargetPlan extends Component
             ->where('line_id', $lineId)
             ->whereMonth('created_at', $month)
             ->whereYear('created_at', $year)
+            ->when($category, function ($query) use ($category) {
+                $query->whereHas('item', function ($q) use ($category) {
+                    $q->where('category', $category);
+                });
+            })
             ->groupBy('plant_id', 'line_id', 'item_id', DB::raw('DATE(created_at)'))
             ->get()
             ->groupBy(fn($row) =>
@@ -249,7 +259,7 @@ class ProductionTargetPlan extends Component
             $lineCapacity = (float) ($row['line_capacity'] ?? 0);
             $dailyLineCapacity = (float) ($row['line_capacity'] ?? 0);
 
-
+            $row['category'] = $row['category'] ?? '-';
             $row['daily_line_capacity'] = [];
             $row['daily_target_dynamic'] = [];
             $row['produced_quantity'] = [];
@@ -291,6 +301,122 @@ class ProductionTargetPlan extends Component
     }
 
 
+    // public function loadProductionDataCategory($year, $month, $plantId, $lineId, $category)
+    // {
+    //     if (!$plantId || !$lineId || !$month || !$year || !$category) {
+    //         $this->records = [];
+    //         $this->dates = [];
+    //         $this->leaveDates = [];
+    //         return;
+    //     }
+
+    //     $dates = $this->getMonthDates($month, $year);
+    //     $this->dates = $dates;
+
+    //     $plans = ProductionPlan::query()
+    //         ->join('items', 'items.id', '=', 'production_plans.item_id')
+    //         ->join('lines', 'lines.id', '=', 'production_plans.line_id')
+    //         ->join('plants', 'plants.id', '=', 'production_plans.plant_id')
+    //         ->where('production_plans.plant_id', $plantId)
+    //         ->where('production_plans.line_id', $lineId)
+    //         ->whereMonth('production_plans.created_at', $month)
+    //         ->whereYear('production_plans.created_at', $year)
+    //         ->select(
+    //             'production_plans.item_id',
+    //             'production_plans.plant_id',
+    //             'production_plans.line_id',
+    //             'production_plans.plan_quantity',
+    //             'production_plans.working_days',
+    //             'production_plans.leave_dates',
+    //             'items.code as item_code',
+    //             'items.description as item_description',
+    //             'lines.name as line_name',
+    //             'lines.line_capacity as line_capacity',
+    //             'plants.name as plant_name'
+    //         )
+    //         ->get();
+
+    //     $leaveDates = [];
+
+    //     if ($plans->isNotEmpty() && $plans[0]->leave_dates) {
+    //         $leaveDates = array_map('trim', explode(',', $plans[0]->leave_dates));
+    //     }
+
+    //     $this->leaveDates = $leaveDates;
+
+    //     $producedData = ProductionQuantity::selectRaw("
+    //             plant_id,
+    //             line_id,
+    //             item_id,
+    //             DATE(created_at) as prod_date,
+    //             COUNT(*) as total_qty
+    //         ")
+    //         ->where('plant_id', $plantId)
+    //         ->where('line_id', $lineId)
+    //         ->whereMonth('created_at', $month)
+    //         ->whereYear('created_at', $year)
+    //         ->groupBy('plant_id', 'line_id', 'item_id', DB::raw('DATE(created_at)'))
+    //         ->get()
+    //         ->groupBy(fn($row) =>
+    //             $row->plant_id . '_' . $row->line_id . '_' . $row->item_id
+    //         )
+    //         ->map(fn($group) => $group->keyBy('prod_date'));
+
+
+    //     $records = [];
+
+    //     foreach ($plans as $plan) {
+
+    //         $row = $plan->toArray();
+
+    //         $remainingQty  = (float) $row['plan_quantity'];
+    //         $remainingDays = (int) ($row['working_days'] ?? 0);
+
+    //         $lineCapacity = (float) ($row['line_capacity'] ?? 0);
+    //         $dailyLineCapacity = (float) ($row['line_capacity'] ?? 0);
+
+
+    //         $row['daily_line_capacity'] = [];
+    //         $row['daily_target_dynamic'] = [];
+    //         $row['produced_quantity'] = [];
+
+    //         $key = $row['plant_id'].'_'.$row['line_id'].'_'.$row['item_id'];
+
+    //         foreach ($dates as $date) {
+
+    //             // Skip leave dates fast
+    //             if (isset($leaveDates) && in_array($date, $leaveDates)) {
+    //                 $row['daily_line_capacity'][$date] = '-';
+    //                 $row['daily_target_dynamic'][$date] = '-';
+    //                 $row['produced_quantity'][$date] = '-';
+    //                 continue;
+    //             }
+
+    //             $todayTarget = $remainingDays > 0
+    //                 ? round($remainingQty / $remainingDays, 2)
+    //                 : 0;
+
+    //             $producedQty = $producedData[$key][$date]->total_qty ?? 0;
+
+    //             $row['daily_target_dynamic'][$date] = $todayTarget;
+    //             $row['produced_quantity'][$date] = $producedQty;
+    //             $row['daily_line_capacity'][$date] = $dailyLineCapacity;
+
+    //             // Carry forward remaining qty
+    //             $remainingQty = max(0, $remainingQty - $producedQty);
+
+    //             if ($remainingDays > 0) {
+    //                 $remainingDays--;
+    //             }
+    //         }
+
+    //         $records[] = $row;
+    //     }
+
+    //     $this->records = $records;
+    // }
+
+
     public function exportProductionData()
     {
         return Excel::download(

composer.json

@@ -8,7 +8,7 @@
     "require": {
         "php": "^8.2",
         "alperenersoy/filament-export": "^3.0",
-        "althinect/filament-spatie-roles-permissions": "^3.0",
+        "althinect/filament-spatie-roles-permissions": "^2.3",
         "erag/laravel-pwa": "^1.9",
         "filament/filament": "^3.3",
         "intervention/image": "^3.11",

resources/views/forms/calendar.blade.php

@@ -64,57 +64,57 @@ document.addEventListener('DOMContentLoaded', function () {
 });
 
 
-  //  function updateWorkingDays(date) {
-    //     let totalDays = new Date(
-    //         date.getFullYear(),
-    //         date.getMonth()+1,
-    //         0
-    //     ).getDate();
-
-    //     let workingDays = totalDays - selectedDates.length;
-    //     // document.querySelector('input[name="working_days"]').value = workingDays;
-
-    //     const input = document.querySelector('#working_days');
-
-    //     input.value = workingDays;
-
-    //     input.dispatchEvent(new Event('input'));
-
-    //     const monthInput = document.querySelector('#month');
-    //     monthInput.value = date.getMonth() + 1; // 1–12 month number
-    //     monthInput.dispatchEvent(new Event('input'));
-
-    //     const yearInput = document.querySelector('#year');
-    //     yearInput.value = date.getFullYear();
-    //     yearInput.dispatchEvent(new Event('input'));
-
-    //     const selectedDatesInput = document.querySelector('#selected_dates');
-    //     selectedDatesInput.value = selectedDates.join(',');
-    //     selectedDatesInput.dispatchEvent(new Event('input'));
-
-    // }
-
-    function updateWorkingDays(date) {
+   function updateWorkingDays(date) {
         let totalDays = new Date(
             date.getFullYear(),
-            date.getMonth() + 1,
+            date.getMonth()+1,
             0
         ).getDate();
 
         let workingDays = totalDays - selectedDates.length;
+        // document.querySelector('input[name="working_days"]').value = workingDays;
 
-        // Set values only
-        document.querySelector('#working_days').value = workingDays;
-        document.querySelector('#month').value = date.getMonth() + 1;
-        document.querySelector('#year').value = date.getFullYear();
-        document.querySelector('#selected_dates').value = selectedDates.join(',');
+        const input = document.querySelector('#working_days');
+
+        input.value = workingDays;
+
+        input.dispatchEvent(new Event('input'));
+
+        const monthInput = document.querySelector('#month');
+        monthInput.value = date.getMonth() + 1; // 1–12 month number
+        monthInput.dispatchEvent(new Event('input'));
+
+        const yearInput = document.querySelector('#year');
+        yearInput.value = date.getFullYear();
+        yearInput.dispatchEvent(new Event('input'));
+
+        const selectedDatesInput = document.querySelector('#selected_dates');
+        selectedDatesInput.value = selectedDates.join(',');
+        selectedDatesInput.dispatchEvent(new Event('input'));
 
-        // Trigger only ONE update (important)
-        document
-            .querySelector('#selected_dates')
-            .dispatchEvent(new Event('input'));
     }
 
+    // function updateWorkingDays(date) {
+    //     let totalDays = new Date(
+    //         date.getFullYear(),
+    //         date.getMonth() + 1,
+    //         0
+    //     ).getDate();
+
+    //     let workingDays = totalDays - selectedDates.length;
+
+    //     // Set values only
+    //     document.querySelector('#working_days').value = workingDays;
+    //     document.querySelector('#month').value = date.getMonth() + 1;
+    //     document.querySelector('#year').value = date.getFullYear();
+    //     document.querySelector('#selected_dates').value = selectedDates.join(',');
+
+    //     // Trigger only ONE update (important)
+    //     document
+    //         .querySelector('#selected_dates')
+    //         .dispatchEvent(new Event('input'));
+    // }
+
 
     calendar.render();
 });

resources/views/livewire/production-target-plan.blade.php

@@ -6,10 +6,11 @@
         <table class="w-full divide-y divide-gray-200 text-sm text-center">
             <thead class="bg-gray-100 text-s font-semibold uppercase text-gray-700">
                 <tr>
-                    <th class="border px-4 py-2" rowspan="3">No</th>
+                    <th class="border px-4 py-2" rowspan="4">No</th>
                     <th class="border px-4 py-2 whitespace-nowrap" rowspan="3">Plant</th>
                     <th class="border px-4 py-2 whitespace-nowrap" rowspan="3">Line</th>
                     <th class="border px-4 py-2 whitespace-nowrap" rowspan="3">Item Code</th>
+                    <th class="border px-4 py-2 whitespace-nowrap" rowspan="3">Category</th>
 
                     <th class="border px-4 py-2 whitespace-nowrap" colspan="{{ count($dates) * 3 }}" class="text-center">
                         Production Plan Dates
@@ -45,6 +46,7 @@
                             <td class="border px-4 py-2 whitespace-nowrap">{{ $record['plant_name'] }}</td>
                             <td class="border px-4 py-2 whitespace-nowrap">{{ $record['line_name'] }}</td>
                             <td class="border px-4 py-2 whitespace-nowrap">{{ $record['item_code'] }}</td>
+                            <td class="border px-4 py-2 whitespace-nowrap">{{ $record['category'] }}</td>
 
                             {{-- @foreach($dates as $date)
                                 <td class="border px-4 py-2 whitespace-nowrap">{{ $record['target_plan'][$date] ?? '-' }}</td>