Merge pull request 'Changed removed logic in for remove serial number' (#602) from ranjith-dev into master
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
Reviewed-on: #602
This commit was merged in pull request #602.
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user