Added logic for line validation in quality validation page
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 16s
Gemini PR Review / Gemini PR Review (pull_request) Failing after 20s
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (pull_request) Successful in 14s
Laravel Pint / pint (pull_request) Successful in 3m42s
Laravel Larastan / larastan (pull_request) Failing after 5m40s
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 16s
Gemini PR Review / Gemini PR Review (pull_request) Failing after 20s
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (pull_request) Successful in 14s
Laravel Pint / pint (pull_request) Successful in 3m42s
Laravel Larastan / larastan (pull_request) Failing after 5m40s
This commit is contained in:
@@ -283,6 +283,7 @@ class QualityValidationResource extends Resource
|
||||
$set('show_validation_image', false);
|
||||
$set('part_validation_type_options', []);
|
||||
$set('validation1_image_url', null);
|
||||
$set('serial_number', null);
|
||||
|
||||
return;
|
||||
}
|
||||
@@ -444,6 +445,20 @@ class QualityValidationResource extends Resource
|
||||
$set('validation1_image_url', null);
|
||||
|
||||
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);
|
||||
@@ -468,20 +483,8 @@ class QualityValidationResource extends Resource
|
||||
|
||||
$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')) {
|
||||
$set('validationError', 'Serial number already exists in quality validation.');
|
||||
// $set('item_id', "$itemCode|$previousSerialNumber");
|
||||
// $set('item_id', null);
|
||||
$set('sticker_master_id', null);
|
||||
$set('uom', 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;
|
||||
|
||||
foreach ($serialFields as $column) {
|
||||
|
||||
Reference in New Issue
Block a user