Merge pull request 'duplicate validation serial number logic against sticker id in bulk sticker printing page' (#1097) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 19s

Reviewed-on: #1097
This commit was merged in pull request #1097.
This commit is contained in:
2026-09-25 07:04:30 +00:00

View File

@@ -901,7 +901,7 @@ class BulkStickerPrinting extends Page implements HasForms
}
}
$updatePrintStatusCompleted = StickerOrder::where('plant_id', $plantId)->where('production_order', $pOrder)->where('from_serial_number', $fromSerNo)->where('to_serial_number', $toSerNo)->where('sticker_id', $stickerId)->where('print_status', 'Printed')->first();
$updatePrintStatusCompleted = StickerOrder::where('plant_id', $plantId)->where('production_order', $pOrder)->where('sticker_id', $stickerId)->where('from_serial_number', $fromSerNo)->where('to_serial_number', $toSerNo)->where('sticker_id', $stickerId)->where('print_status', 'Printed')->first();
if ($updatePrintStatusCompleted) {
Notification::make()
@@ -914,6 +914,7 @@ class BulkStickerPrinting extends Page implements HasForms
$existingSticker = StickerOrder::where('plant_id', $plantId)
->where('production_order', $pOrder)
->where('sticker_id', $stickerId)
->where('print_status', 'Printed')
->where(function ($query) use ($fromSerNo, $toSerNo) {
$query->whereIn('from_serial_number', [$fromSerNo, $toSerNo])
@@ -1096,7 +1097,6 @@ class BulkStickerPrinting extends Page implements HasForms
return;
}
// dd($matchedMachineId);
$itemCharacteristic = ClassCharacteristic::where('plant_id', $plantId)
->where('item_id', $itemCharacteristicId)