From 7e543b30c3db62615c655492ceae6f18e95e07b6 Mon Sep 17 00:00:00 2001 From: dhanabalan Date: Fri, 15 May 2026 11:58:46 +0530 Subject: [PATCH] Changed removed logic in for remove serial number --- .../Pages/CreateWireMasterPacking.php | 33 +++++++++++++++++-- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/app/Filament/Resources/WireMasterPackingResource/Pages/CreateWireMasterPacking.php b/app/Filament/Resources/WireMasterPackingResource/Pages/CreateWireMasterPacking.php index 5a90e3f..8cff2eb 100644 --- a/app/Filament/Resources/WireMasterPackingResource/Pages/CreateWireMasterPacking.php +++ b/app/Filament/Resources/WireMasterPackingResource/Pages/CreateWireMasterPacking.php @@ -648,6 +648,33 @@ class CreateWireMasterPacking extends CreateRecord return; } + $pattern = '/^([^|]+)\|([^|]+)\|([^|]+)\|(\d+(\.\d+)?)(kg)?$/i'; + + if (!preg_match($pattern, $processOrder, $matches)) + { + Notification::make() + ->title("Scan Valid Qr code ") + ->body("Expected Format : (MaterialCode|Process Order|Id|Weight)") + ->danger() + ->duration(5000) + ->send(); + + $this->form->fill([ + 'process_order' => null, + 'plant_id' => $plantId, + 'customer_po_master_id' => $customerPo, + 'Sno_quantity' => 0, + 'created_by' => $operatorName, + 'scanned_by' => $operatorName, + ]); + return; + } + + $materialCode = $matches[1]; + $processOrderId = $matches[2]; + $coilNo = $matches[3]; + $weight = $matches[4]; + $count = WireMasterPacking::where('plant_id', $plantId) ->where('wire_packing_number', $palletNumber) ->count('wire_packing_number'); @@ -676,7 +703,7 @@ class CreateWireMasterPacking extends CreateRecord $processOrderexist = WireMasterPacking::where('plant_id', $plantId) - ->where('process_order', $processOrder) + ->where('process_order', $processOrderId . '-' . $coilNo) ->first(); if (!$processOrderexist) { @@ -701,7 +728,7 @@ class CreateWireMasterPacking extends CreateRecord } $palletExist = WireMasterPacking::where('plant_id', $plantId) - ->where('process_order', $processOrder) + ->where('process_order', $processOrderId . '-' . $coilNo) ->where('wire_packing_number', '!=', '') ->where('wire_packing_number', '!=', null) ->first(); @@ -731,7 +758,7 @@ class CreateWireMasterPacking extends CreateRecord $deleted = WireMasterPacking::where('plant_id', $plantId) ->where('wire_packing_number', $palletNumber) - ->where('process_order', $processOrder) + ->where('process_order', $processOrderId . '-' . $coilNo) ->forceDelete(); if ($deleted)