From 907b6d12948cda9d61920b4a9958a4e23139f906 Mon Sep 17 00:00:00 2001
From: Trenton H <797416+stumpylog@users.noreply.github.com>
Date: Tue, 13 Feb 2024 08:26:13 -0800
Subject: [PATCH] Handle the ASN assignment last, after the splitting (#5745)

---
 src/documents/barcodes.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/documents/barcodes.py b/src/documents/barcodes.py
index 5bf622651..fe1e94b8a 100644
--- a/src/documents/barcodes.py
+++ b/src/documents/barcodes.py
@@ -87,14 +87,6 @@ class BarcodePlugin(ConsumeTaskPlugin):
         # Locate any barcodes in the files
         self.detect()
 
-        # Update/overwrite an ASN if possible
-        if (
-            settings.CONSUMER_ENABLE_ASN_BARCODE
-            and (located_asn := self.asn) is not None
-        ):
-            logger.info(f"Found ASN in barcode: {located_asn}")
-            self.metadata.asn = located_asn
-
         # try reading tags from barcodes
         if (
             settings.CONSUMER_ENABLE_TAG_BARCODE
@@ -154,6 +146,15 @@ class BarcodePlugin(ConsumeTaskPlugin):
             # Request the consume task stops
             raise StopConsumeTaskError(msg)
 
+        # Update/overwrite an ASN if possible
+        # After splitting, as otherwise each split document gets the same ASN
+        if (
+            settings.CONSUMER_ENABLE_ASN_BARCODE
+            and (located_asn := self.asn) is not None
+        ):
+            logger.info(f"Found ASN in barcode: {located_asn}")
+            self.metadata.asn = located_asn
+
     def cleanup(self) -> None:
         self.temp_dir.cleanup()