From a1f3bc555e0747ee031453debc7cda688fd11a78 Mon Sep 17 00:00:00 2001 From: dhanabalan Date: Mon, 23 Feb 2026 14:58:17 +0530 Subject: [PATCH] Update process order logic on importer --- app/Filament/Imports/ProcessOrderImporter.php | 30 +++++-------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/app/Filament/Imports/ProcessOrderImporter.php b/app/Filament/Imports/ProcessOrderImporter.php index 9543a4b..744e7cd 100644 --- a/app/Filament/Imports/ProcessOrderImporter.php +++ b/app/Filament/Imports/ProcessOrderImporter.php @@ -146,11 +146,6 @@ class ProcessOrderImporter extends Importer $reworkStatus = 0; } - if ($createdBy == null || $createdBy == '') { - $createdBy = Filament::auth()->user()?->name; - $updatedBy = $createdBy; - } - if (Str::length($plantCod) < 4 || ! is_numeric($plantCod) || ! preg_match('/^[1-9]\d{3,}$/', $plantCod)) { $warnMsg[] = 'Invalid plant code found'; } else { @@ -209,22 +204,10 @@ class ProcessOrderImporter extends Importer $lineId = null; } - if ($createdBy != null && $createdBy != '') { - if ($plantId) { - $user = User::where('name', $createdBy)->first(); - - $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; - } + // $user = User::where('name', $this->data['created_by'])->first(); + // if (! $user) { + // $warnMsg[] = 'User not found'; + // } if (! empty($warnMsg)) { throw new RowImportFailedException(implode(', ', $warnMsg)); @@ -280,9 +263,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 +281,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, -- 2.49.1