From bf2a776403583559f1f2b6abb9c66dbe4929b317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20B=C3=B6hmer?= Date: Sat, 4 Jan 2025 18:41:27 +0100 Subject: [PATCH] Do the EIGP114 detection after userdefined barcode detection, so that users can override it on their partLots --- .../LabelSystem/BarcodeScanner/BarcodeScanHelper.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Services/LabelSystem/BarcodeScanner/BarcodeScanHelper.php b/src/Services/LabelSystem/BarcodeScanner/BarcodeScanHelper.php index 6d2cb8c9..e5930b36 100644 --- a/src/Services/LabelSystem/BarcodeScanner/BarcodeScanHelper.php +++ b/src/Services/LabelSystem/BarcodeScanner/BarcodeScanHelper.php @@ -94,12 +94,6 @@ final class BarcodeScanHelper } //Null means auto and we try the different formats - - //If the barcode is formatted as EIGP114, we can parse it directly - if (EIGP114BarcodeScanResult::isFormat06Code($input)) { - return $this->parseEIGP114Barcode($input); - } - $result = $this->parseInternalBarcode($input); if ($result !== null) { @@ -112,6 +106,11 @@ final class BarcodeScanHelper return $result; } + //If the barcode is formatted as EIGP114, we can parse it directly + if (EIGP114BarcodeScanResult::isFormat06Code($input)) { + return $this->parseEIGP114Barcode($input); + } + //Try to parse as IPN barcode $result = $this->parseIPNBarcode($input); if ($result !== null) {