Merge pull request 'changed logic in bulk sticker printing' (#1255) from ranjith-dev into master
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled

Reviewed-on: #1255
This commit was merged in pull request #1255.
This commit is contained in:
2026-10-15 07:57:08 +00:00

View File

@@ -1008,19 +1008,19 @@ class BulkStickerPrinting extends Page implements HasForms
$matchedMachineId = null;
// for ($i = 1; $i <= 8; $i++) {
for ($i = 1; $i <= 8; $i++) {
// $machineColumn = "sticker{$i}_machine_id";
$machineColumn = "sticker{$i}_machine_id";
// if ((string) $stickerMappingMasterItem->{$machineColumn} == (string) $machineId) {
if ((string) $stickerMappingMasterItem->{$machineColumn} == (string) $machineId) {
// $matchedMachineId = $stickerMappingMasterItem->{$machineColumn};
$matchedMachineId = $stickerMappingMasterItem->{$machineColumn};
// break;
// }
// }
break;
}
}
$matchedMachineId = StickerMappingMaster::where('plant_id', $plantId)->where('item_id', $pOrderExist->item_id)->where('sticker_structure1_id', $structure->id)->where('sticker1_machine_id', $machineId)->first();
// $matchedMachineId = StickerMappingMaster::where('plant_id', $plantId)->where('item_id', $pOrderExist->item_id)->where('sticker_structure1_id', $structure->id)->where('sticker1_machine_id', $machineId)->first();
if (!$matchedMachineId) {