Merge remote-tracking branch 'origin/MODEXPW-452_ISSN' into MODEXPW-4…

…52_ISSN
folio-org · Jan 10, 2024 · e10a592 · e10a592
2 parents 37d2f70 + 1f404f5
commit e10a592
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/org/folio/dew/batch/acquisitions/edifact/CompositePOConverter.java b/src/main/java/org/folio/dew/batch/acquisitions/edifact/CompositePOConverter.java
@@ -28,7 +28,7 @@ public void convertPOtoEdifact(EDIStreamWriter writer, CompositePurchaseOrder co
     int messageSegmentCount = 0;
 
     messageSegmentCount++;
-    writePOHeader(ediFileConfig.getFileId(), writer);
+    writePOHeader(compPO, writer);
 
     String rushOrderQualifier = compPO.getCompositePoLines().stream().filter(line -> line.getRush() != null).anyMatch(CompositePoLine::getRush) ? RUSH_ORDER : NOT_RUSH_ORDER;
     messageSegmentCount++;
@@ -78,9 +78,9 @@ public void convertPOtoEdifact(EDIStreamWriter writer, CompositePurchaseOrder co
   }
 
   // Order header = Start of order; EDIFACT message type - There would be a new UNH for each FOLIO PO in the file
-  private void writePOHeader(String fileId, EDIStreamWriter writer) throws EDIStreamException {
+  private void writePOHeader(CompositePurchaseOrder compPO, EDIStreamWriter writer) throws EDIStreamException {
     writer.writeStartSegment("UNH")
-      .writeElement(fileId)
+      .writeElement(compPO.getPoNumber())
       .writeStartElement()
       .writeComponent("ORDERS")
       .writeComponent("D")

diff --git a/src/test/resources/edifact/acquisitions/edifact_orders_result.edi b/src/test/resources/edifact/acquisitions/edifact_orders_result.edi
@@ -1,6 +1,6 @@
 UNA:+.? '
 UNB+UNOC:3+901494200:014+0142948:31B+ddmmyy:hhmm+{fileId}'
-UNH+{fileId}+ORDERS:D:96A:UN:EAN008'
+UNH+10000+ORDERS:D:96A:UN:EAN008'
 BGM+220+10000+9'
 DTM+137::102'
 NAD+BY+901494200::014'
@@ -23,7 +23,7 @@ UNS+S'
 CNT+1:1'
 CNT+2:1'
 UNT+23+10000'
-UNH+{fileId}+ORDERS:D:96A:UN:EAN008'
+UNH+10001+ORDERS:D:96A:UN:EAN008'
 BGM+224+10001+9'
 DTM+137::102'
 NAD+BY+901494200::014'
@@ -79,7 +79,7 @@ UNS+S'
 CNT+1:4'
 CNT+2:2'
 UNT+56+10001'
-UNH+{fileId}+ORDERS:D:96A:UN:EAN008'
+UNH+10002+ORDERS:D:96A:UN:EAN008'
 BGM+220+10002+9'
 DTM+137::102'
 NAD+BY+901494200::014'
@@ -94,7 +94,7 @@ UNS+S'
 CNT+1:0'
 CNT+2:1'
 UNT+15+10002'
-UNH+{fileId}+ORDERS:D:96A:UN:EAN008'
+UNH+10003+ORDERS:D:96A:UN:EAN008'
 BGM+220+10003+9'
 DTM+137::102'
 NAD+BY+901494200::014'
@@ -109,7 +109,7 @@ UNS+S'
 CNT+1:0'
 CNT+2:1'
 UNT+15+10003'
-UNH+{fileId}+ORDERS:D:96A:UN:EAN008'
+UNH+10004+ORDERS:D:96A:UN:EAN008'
 BGM+220+10004+9'
 DTM+137::102'
 NAD+BY+901494200::014'