poc/pds
1
0
Fork 1
Code Issues Pull Requests 12 Actions Packages Projects Releases Wiki Activity

Merge pull request 'Added updated_by column in serial validation' (#706) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 24s
Details

Browse Source 
Reviewed-on: #706
This commit was merged in pull request #706.
This commit is contained in:
jothi
2026-06-05 03:53:54 +00:00
parent 0abdf02e9d b582a18a14
commit 8cd0a310b3
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/Filament/Resources/SerialValidationResource/Pages/CreateSerialValidation.php
View File

@@ -350,7 +350,7 @@ class CreateSerialValidation extends CreateRecord
// ->send(); // ->send();
// $this->dispatch('playNotificationSound'); // $this->dispatch('playNotificationSound');
// // $hasRecords = InvoiceValidation::where('invoice_number', $invoiceNumber)->where('plant_id', $plantId)->first()->stickerMasterRelation->material_type ?? null; // // $hasRecords = SerialValidation::where('invoice_number', $invoiceNumber)->where('plant_id', $plantId)->first()->stickerMasterRelation->material_type ?? null;
// // $this->dispatch( (!empty($hasRecords) && $hasRecords) ? 'refreshMaterialInvoiceData' : 'refreshInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId); //$this->invoiceNumber // // $this->dispatch( (!empty($hasRecords) && $hasRecords) ? 'refreshMaterialInvoiceData' : 'refreshInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId); //$this->invoiceNumber
// $this->dispatch('refreshMaterialInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId); // $this->dispatch('refreshMaterialInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId);
@@ -994,7 +994,7 @@ class CreateSerialValidation extends CreateRecord
// 'total_quantity' => $totQuan, // 'total_quantity' => $totQuan,
// 'scanned_quantity'=> $scanSQuan, // 'scanned_quantity'=> $scanSQuan,
// ]); // ]);
// //$hasRecords = InvoiceValidation::where('invoice_number', $invoiceNumber)->where('plant_id', $plantId)->first()->stickerMasterRelation->material_type ?? null; // //$hasRecords = SerialValidation::where('invoice_number', $invoiceNumber)->where('plant_id', $plantId)->first()->stickerMasterRelation->material_type ?? null;
// // $this->dispatch('refreshInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId); // // $this->dispatch('refreshInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId);
// if ($totQuan == $scanSQuan) // if ($totQuan == $scanSQuan)
@@ -1421,7 +1421,7 @@ class CreateSerialValidation extends CreateRecord
// // $disk->delete($filePath); // // $disk->delete($filePath);
// // } // // }
// // $hasRecords = InvoiceValidation::where('invoice_number', $invoiceNumber)->where('plant_id', $plantId)->first()->stickerMasterRelation->material_type ?? null; // // $hasRecords = SerialValidation::where('invoice_number', $invoiceNumber)->where('plant_id', $plantId)->first()->stickerMasterRelation->material_type ?? null;
// // $this->dispatch( (!empty($hasRecords) && $hasRecords) ? 'refreshMaterialInvoiceData' : 'refreshInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId); //$this->invoiceNumber // // $this->dispatch( (!empty($hasRecords) && $hasRecords) ? 'refreshMaterialInvoiceData' : 'refreshInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId); //$this->invoiceNumber
// $this->dispatch('refreshInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId); // $this->dispatch('refreshInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId);
// } // }
@@ -2033,7 +2033,7 @@ class CreateSerialValidation extends CreateRecord
// // $disk->delete($filePath); // // $disk->delete($filePath);
// // } // // }
// // $hasRecords = InvoiceValidation::where('invoice_number', $invoiceNumber)->where('plant_id', $plantId)->first()->stickerMasterRelation->material_type ?? null; // // $hasRecords = SerialValidation::where('invoice_number', $invoiceNumber)->where('plant_id', $plantId)->first()->stickerMasterRelation->material_type ?? null;
// // $this->dispatch( (!empty($hasRecords) && $hasRecords) ? 'refreshMaterialInvoiceData' : 'refreshInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId); //$this->invoiceNumber // // $this->dispatch( (!empty($hasRecords) && $hasRecords) ? 'refreshMaterialInvoiceData' : 'refreshInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId); //$this->invoiceNumber
// $this->dispatch('refreshMaterialInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId); // $this->dispatch('refreshMaterialInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId);
// } // }
@@ -2416,7 +2416,7 @@ class CreateSerialValidation extends CreateRecord
// // $disk->delete($filePath); // // $disk->delete($filePath);
// // } // // }
// // $hasRecords = InvoiceValidation::where('invoice_number', $invoiceNumber)->where('plant_id', $plantId)->first()->stickerMasterRelation->material_type ?? null; // // $hasRecords = SerialValidation::where('invoice_number', $invoiceNumber)->where('plant_id', $plantId)->first()->stickerMasterRelation->material_type ?? null;
// // $this->dispatch( (!empty($hasRecords) && $hasRecords) ? 'refreshMaterialInvoiceData' : 'refreshInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId); //$this->invoiceNumber // // $this->dispatch( (!empty($hasRecords) && $hasRecords) ? 'refreshMaterialInvoiceData' : 'refreshInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId); //$this->invoiceNumber
// $this->dispatch('refreshInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId); // $this->dispatch('refreshInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId);
// } // }
@@ -2980,6 +2980,7 @@ class CreateSerialValidation extends CreateRecord
'quantity' => 1, 'quantity' => 1,
'operator_id' => $operatorName, 'operator_id' => $operatorName,
'created_by' => $operatorName, 'created_by' => $operatorName,
'updated_by' => $operatorName,
]); ]);
$inserted++; $inserted++;
} }
@@ -3021,6 +3022,7 @@ class CreateSerialValidation extends CreateRecord
'quantity' => $bundleQty, 'quantity' => $bundleQty,
'operator_id' => $operatorName, 'operator_id' => $operatorName,
'created_by' => $operatorName, 'created_by' => $operatorName,
'updated_by' => $operatorName,
]); ]);
$inserted++; $inserted++;
} }
@@ -3084,6 +3086,7 @@ class CreateSerialValidation extends CreateRecord
$existEmpRecQty->update([ $existEmpRecQty->update([
'quantity' => $newInsQty, 'quantity' => $newInsQty,
'operator_id' => $operatorName, 'operator_id' => $operatorName,
'updated_by' => $operatorName,
'updated_at' => now(), 'updated_at' => now(),
]); ]);
$newQuan--; $newQuan--;
@@ -3096,6 +3099,7 @@ class CreateSerialValidation extends CreateRecord
'quantity' => $newInsQty, 'quantity' => $newInsQty,
'operator_id' => $operatorName, 'operator_id' => $operatorName,
'created_by' => $operatorName, 'created_by' => $operatorName,
'updated_by' => $operatorName,
]); ]);
$inserted++; $inserted++;
} }
@@ -3115,6 +3119,7 @@ class CreateSerialValidation extends CreateRecord
$existEmpRecQty->update([ $existEmpRecQty->update([
'quantity' => $newInsQty, 'quantity' => $newInsQty,
'operator_id' => $operatorName, 'operator_id' => $operatorName,
'updated_by' => $operatorName,
'updated_at' => now(), 'updated_at' => now(),
]); ]);
$newQuan--; $newQuan--;
@@ -3127,6 +3132,7 @@ class CreateSerialValidation extends CreateRecord
'quantity' => $newInsQty, 'quantity' => $newInsQty,
'operator_id' => $operatorName, 'operator_id' => $operatorName,
'created_by' => $operatorName, 'created_by' => $operatorName,
'updated_by' => $operatorName,
]); ]);
$inserted++; $inserted++;
} }
@@ -3605,6 +3611,7 @@ class CreateSerialValidation extends CreateRecord
'serial_number' => $serialNumber, 'serial_number' => $serialNumber,
'operator_id' => $operatorName, 'operator_id' => $operatorName,
'created_by' => $operatorName, 'created_by' => $operatorName,
'updated_by' => $operatorName,
]); ]);
$inserted++; $inserted++;
} }
@@ -4153,6 +4160,7 @@ class CreateSerialValidation extends CreateRecord
'quantity' => 1, 'quantity' => 1,
'operator_id' => $operatorName, 'operator_id' => $operatorName,
'created_by' => $operatorName, 'created_by' => $operatorName,
'updated_by' => $operatorName,
]); ]);
$inserted++; $inserted++;
} }
@@ -4187,6 +4195,7 @@ class CreateSerialValidation extends CreateRecord
'quantity' => $bundleQty, 'quantity' => $bundleQty,
'operator_id' => $operatorName, 'operator_id' => $operatorName,
'created_by' => $operatorName, 'created_by' => $operatorName,
'updated_by' => $operatorName,
]); ]);
$inserted++; $inserted++;
} }
@@ -4219,6 +4228,7 @@ class CreateSerialValidation extends CreateRecord
'quantity' => $totalExcelQty, 'quantity' => $totalExcelQty,
'operator_id' => $operatorName, 'operator_id' => $operatorName,
'created_by' => $operatorName, 'created_by' => $operatorName,
'updated_by' => $operatorName,
]); ]);
$inserted++; $inserted++;
} }
@@ -4256,7 +4266,7 @@ class CreateSerialValidation extends CreateRecord
// $disk->delete($filePath); // $disk->delete($filePath);
// } // }
// $hasRecords = InvoiceValidation::where('invoice_number', $invoiceNumber)->where('plant_id', $plantId)->first()->stickerMasterRelation->material_type ?? null; // $hasRecords = SerialValidation::where('invoice_number', $invoiceNumber)->where('plant_id', $plantId)->first()->stickerMasterRelation->material_type ?? null;
// $this->dispatch( (!empty($hasRecords) && $hasRecords) ? 'refreshMaterialInvoiceData' : 'refreshInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId, onCapFocus: false); //$this->invoiceNumber // $this->dispatch( (!empty($hasRecords) && $hasRecords) ? 'refreshMaterialInvoiceData' : 'refreshInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId, onCapFocus: false); //$this->invoiceNumber
$this->dispatch('refreshMaterialInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId); $this->dispatch('refreshMaterialInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId);
} }
@@ -4584,6 +4594,7 @@ class CreateSerialValidation extends CreateRecord
'serial_number' => $serialNumber, 'serial_number' => $serialNumber,
'operator_id' => $operatorName, 'operator_id' => $operatorName,
'created_by' => $operatorName, 'created_by' => $operatorName,
'updated_by' => $operatorName,
]); ]);
$inserted++; $inserted++;
} }
@@ -4621,7 +4632,7 @@ class CreateSerialValidation extends CreateRecord
// $disk->delete($filePath); // $disk->delete($filePath);
// } // }
// $hasRecords = InvoiceValidation::where('invoice_number', $invoiceNumber)->where('plant_id', $plantId)->first()->stickerMasterRelation->material_type ?? null; // $hasRecords = SerialValidation::where('invoice_number', $invoiceNumber)->where('plant_id', $plantId)->first()->stickerMasterRelation->material_type ?? null;
// $this->dispatch( (!empty($hasRecords) && $hasRecords) ? 'refreshMaterialInvoiceData' : 'refreshInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId, onCapFocus: false); //$this->invoiceNumber // $this->dispatch( (!empty($hasRecords) && $hasRecords) ? 'refreshMaterialInvoiceData' : 'refreshInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId, onCapFocus: false); //$this->invoiceNumber
$this->dispatch('refreshInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId, onCapFocus: false); $this->dispatch('refreshInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId, onCapFocus: false);
} }