Merge pull request #283 from b123400/fix-278

Add 137 document date to order response
zdavatz · Jul 14, 2024 · 1b84ff2 · 1b84ff2
2 parents d87ed16 + bc7b929
commit 1b84ff2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/java/converter/src/main/java/com/ywesee/java/yopenedi/Edifact/Invoice.java b/java/converter/src/main/java/com/ywesee/java/yopenedi/Edifact/Invoice.java
@@ -172,18 +172,18 @@ public void write(OutputStream outputStream) throws Exception {
                 C507DateTimePeriod orderC507 = new C507DateTimePeriod();
                 // Reference date/time
                 // Date/time on which the reference was issued.
-                orderC507.setE2005DateTimePeriodQualifier("171");
+                orderC507.setE2005DateTimePeriodQualifier("171"); // Reference date = Bestelldatum #278
                 orderC507.setE2380DateTimePeriod(df.format(this.orderDate));
                 orderC507.setE2379DateTimePeriodFormatQualifier("102");
                 issueDate.setC507DateTimePeriod(orderC507);
                 dtms.add(issueDate);
             }
-            if (this.orderDate != null) {
+            if (this.invoiceDate != null) {
                 DTMDateTimePeriod orderDate = new DTMDateTimePeriod();
                 segmentCount++;
                 C507DateTimePeriod orderC507 = new C507DateTimePeriod();
-                orderC507.setE2005DateTimePeriodQualifier("137"); // order date Belegdatum
-                orderC507.setE2380DateTimePeriod(df.format(this.orderDate));
+                orderC507.setE2005DateTimePeriodQualifier("137"); // Document date = Belegdatum #278
+                orderC507.setE2380DateTimePeriod(df.format(this.invoiceDate));
                 orderC507.setE2379DateTimePeriodFormatQualifier("102");
                 orderDate.setC507DateTimePeriod(orderC507);
                 dtms.add(orderDate);

diff --git a/java/converter/src/main/java/com/ywesee/java/yopenedi/Edifact/OrderResponse.java b/java/converter/src/main/java/com/ywesee/java/yopenedi/Edifact/OrderResponse.java
@@ -159,12 +159,23 @@ public void write(OutputStream outputStream) throws Exception {
                 DTMDateTimePeriod orderDate = new DTMDateTimePeriod();
                 segmentCount++;
                 C507DateTimePeriod orderC507 = new C507DateTimePeriod();
-                orderC507.setE2005DateTimePeriodQualifier("171"); // order date Belegdatum
+                orderC507.setE2005DateTimePeriodQualifier("171"); // Reference Date = Bestelldatum #278
                 orderC507.setE2380DateTimePeriod(df.format(this.orderDate));
                 orderC507.setE2379DateTimePeriodFormatQualifier("102");
                 orderDate.setC507DateTimePeriod(orderC507);
                 dtms.add(orderDate);
             }
+            if (this.referenceDate != null) {
+                DateFormat df = new SimpleDateFormat("yyyyMMdd");
+                DTMDateTimePeriod orderDate = new DTMDateTimePeriod();
+                segmentCount++;
+                C507DateTimePeriod orderC507 = new C507DateTimePeriod();
+                orderC507.setE2005DateTimePeriodQualifier("137"); // Document date = Belegdatum
+                orderC507.setE2380DateTimePeriod(df.format(this.referenceDate));
+                orderC507.setE2379DateTimePeriodFormatQualifier("102");
+                orderDate.setC507DateTimePeriod(orderC507);
+                dtms.add(orderDate);
+            }
             if (this.deliveryDate != null) {
                 DateFormat df = new SimpleDateFormat("yyyyMMdd");
                 DTMDateTimePeriod deliveryDate = new DTMDateTimePeriod();