Added logic for line validation in quality validation page #1234

Merged
jothi merged 1 commits from ranjith-dev into master 2026-10-13 05:17:16 +00:00

View File

@@ -283,6 +283,7 @@ class QualityValidationResource extends Resource
$set('show_validation_image', false); $set('show_validation_image', false);
$set('part_validation_type_options', []); $set('part_validation_type_options', []);
$set('validation1_image_url', null); $set('validation1_image_url', null);
$set('serial_number', null);
return; return;
} }
@@ -444,6 +445,20 @@ class QualityValidationResource extends Resource
$set('validation1_image_url', null); $set('validation1_image_url', null);
return; return;
} elseif (!empty($stickerMaster->item->line_id)) {
if($pId != $stickerMaster->item->line_id){
$set('validationError', "Choose valid line for the scanned item $itemCode.");
$set('item_id', null);
$set('sticker_master_id', null);
$set('uom', null);
$set('serial_number', null);
$set('part_validation_type', null);
$set('show_validation_image', false);
$set('part_validation_type_options', []);
$set('validation1_image_url', null);
return;
}
} }
$set('sticker_master_id', $stickerMaster->id); $set('sticker_master_id', $stickerMaster->id);
@@ -468,20 +483,8 @@ class QualityValidationResource extends Resource
$serialExists = QualityValidation::where('serial_number', $serialNumber)->where('plant_id', $plantId)->exists(); $serialExists = QualityValidation::where('serial_number', $serialNumber)->where('plant_id', $plantId)->exists();
// $serialExists = QualityValidation::where(function ($query) use ($serialNumber, $serialFields) {
// foreach ($serialFields as $column) {
// $colFld = $column;
// if (str_ends_with($colFld, '_qr')) {
// $colFld = substr($colFld, 0, -3);
// }
// $query->where($colFld, $serialNumber);
// }
// })->exists();
if ($serialExists && ! $get('id')) { if ($serialExists && ! $get('id')) {
$set('validationError', 'Serial number already exists in quality validation.'); $set('validationError', 'Serial number already exists in quality validation.');
// $set('item_id', "$itemCode|$previousSerialNumber");
// $set('item_id', null);
$set('sticker_master_id', null); $set('sticker_master_id', null);
$set('uom', null); $set('uom', null);
$set('serial_number', null); $set('serial_number', null);
@@ -528,17 +531,6 @@ class QualityValidationResource extends Resource
} }
} }
// foreach ($serialnumber as $field) {
// if ($get("{$field}_visible")) {
// $set($field, $serialNumber);
// $colFld = $field;
// if (str_ends_with($colFld, '_qr')) {
// $colFld = substr($colFld, 0, -3);
// }
// $set($colFld, '1');
// break;
// }
// }
$serialAssigned = false; $serialAssigned = false;
foreach ($serialFields as $column) { foreach ($serialFields as $column) {