Standardized handling of Transport Modes

stephanstapel · stephanstapel · commit 9b5f68da2b83 · 2025-04-01T20:10:03.000+02:00
diff --git a/ZUGFeRD/InvoiceDescriptor1Writer.cs b/ZUGFeRD/InvoiceDescriptor1Writer.cs
@@ -180,7 +180,7 @@ public override void Save(InvoiceDescriptor descriptor, Stream stream, ZUGFeRDFo
             {
                 Writer.WriteStartElement("ram", "RelatedSupplyChainConsignment", Profile.Extended); // BG-X-24
                 Writer.WriteStartElement("ram", "SpecifiedLogisticsTransportMovement", Profile.Extended); // BT-X-152-00
-                Writer.WriteElementString("ram", "ModeCode", String.Format("{0}", EnumExtensions.EnumToInt<TransportModeCodes>(this.Descriptor.TransportMode ?? TransportModeCodes.Unknown))); // BT-X-152
+                Writer.WriteElementString("ram", "ModeCode", EnumExtensions.EnumToString<TransportModeCodes>(this.Descriptor.TransportMode)); // BT-X-152
                 Writer.WriteEndElement(); // !ram:SpecifiedLogisticsTransportMovement 
                 Writer.WriteEndElement(); // !ram:RelatedSupplyChainConsignment
             }
diff --git a/ZUGFeRD/InvoiceDescriptor20Writer.cs b/ZUGFeRD/InvoiceDescriptor20Writer.cs
@@ -526,7 +526,7 @@ public override void Save(InvoiceDescriptor descriptor, Stream stream, ZUGFeRDFo
             {
                 Writer.WriteStartElement("ram", "RelatedSupplyChainConsignment", Profile.Extended); // BG-X-24
                 Writer.WriteStartElement("ram", "SpecifiedLogisticsTransportMovement", Profile.Extended); // BT-X-152-00
-                Writer.WriteElementString("ram", "ModeCode", String.Format("{0}", EnumExtensions.EnumToInt<TransportModeCodes>(this.Descriptor.TransportMode ?? TransportModeCodes.Unknown))); // BT-X-152
+                Writer.WriteElementString("ram", "ModeCode", EnumExtensions.EnumToString<TransportModeCodes>(this.Descriptor.TransportMode)); // BT-X-152
                 Writer.WriteEndElement(); // !ram:SpecifiedLogisticsTransportMovement 
                 Writer.WriteEndElement(); // !ram:RelatedSupplyChainConsignment
             }
diff --git a/ZUGFeRD/InvoiceDescriptor23CIIWriter.cs b/ZUGFeRD/InvoiceDescriptor23CIIWriter.cs
@@ -717,7 +717,7 @@ public override void Save(InvoiceDescriptor descriptor, Stream stream, ZUGFeRDFo
             {
                 Writer.WriteStartElement("ram", "RelatedSupplyChainConsignment", Profile.Extended); // BG-X-24
                 Writer.WriteStartElement("ram", "SpecifiedLogisticsTransportMovement", Profile.Extended); // BT-X-152-00
-                Writer.WriteElementString("ram", "ModeCode", String.Format("{0}", EnumExtensions.EnumToInt<TransportModeCodes>(this.Descriptor.TransportMode ?? TransportModeCodes.Unknown))); // BT-X-152
+                Writer.WriteElementString("ram", "ModeCode", EnumExtensions.EnumToString<TransportModeCodes>(this.Descriptor.TransportMode)); // BT-X-152
                 Writer.WriteEndElement(); // !ram:SpecifiedLogisticsTransportMovement 
                 Writer.WriteEndElement(); // !ram:RelatedSupplyChainConsignment
             }
diff --git a/ZUGFeRD/TransportModeCodes.cs b/ZUGFeRD/TransportModeCodes.cs
@@ -29,51 +29,61 @@ public enum TransportModeCodes
         /// <summary>
         /// Transport mode not specified
         /// </summary>
-        Unknown = 0,
+        [EnumStringValue("0")]
+        TransportModeNotSpecified,
 
         /// <summary>
         /// Maritime transport
         /// </summary>
+        [EnumStringValue("1")]
         Maritime,
 
         /// <summary>
         /// Rail Transport
         /// </summary>
+        [EnumStringValue("2")]
         Rail,
 
         /// <summary>
         /// Road Transport
         /// </summary>
+        [EnumStringValue("3")]
         Road,
 
         /// <summary>
         /// Air Transport
         /// </summary>
+        [EnumStringValue("4")]
         Air,
 
         /// <summary>
         /// Via Mail
         /// </summary>
+        [EnumStringValue("5")]
         Mail,
 
         /// <summary>
         /// Multimodal transport
         /// </summary>
+        [EnumStringValue("6")]
         MultiMode,
 
         /// <summary>
         /// Fixed transport installation
         /// </summary>
+        [EnumStringValue("7")]
         FixedTransport,
 
         /// <summary>
         /// Inland water transport
         /// </summary>
+        [EnumStringValue("8")]
         InlandWater,
 
         /// <summary>
         /// Transport mode not applicable
         /// </summary>
+        [EnumStringValue("9")]
         NotApplicable
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ public override void Save(InvoiceDescriptor descriptor, Stream stream, ZUGFeRDFo`
`180`	`180`	`{`
`181`	`181`	`Writer.WriteStartElement("ram", "RelatedSupplyChainConsignment", Profile.Extended); // BG-X-24`
`182`	`182`	`Writer.WriteStartElement("ram", "SpecifiedLogisticsTransportMovement", Profile.Extended); // BT-X-152-00`
`183`		`- Writer.WriteElementString("ram", "ModeCode", String.Format("{0}", EnumExtensions.EnumToInt<TransportModeCodes>(this.Descriptor.TransportMode ?? TransportModeCodes.Unknown))); // BT-X-152`
	`183`	`+ Writer.WriteElementString("ram", "ModeCode", EnumExtensions.EnumToString<TransportModeCodes>(this.Descriptor.TransportMode)); // BT-X-152`
`184`	`184`	`Writer.WriteEndElement(); // !ram:SpecifiedLogisticsTransportMovement`
`185`	`185`	`Writer.WriteEndElement(); // !ram:RelatedSupplyChainConsignment`
`186`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -526,7 +526,7 @@ public override void Save(InvoiceDescriptor descriptor, Stream stream, ZUGFeRDFo`
`526`	`526`	`{`
`527`	`527`	`Writer.WriteStartElement("ram", "RelatedSupplyChainConsignment", Profile.Extended); // BG-X-24`
`528`	`528`	`Writer.WriteStartElement("ram", "SpecifiedLogisticsTransportMovement", Profile.Extended); // BT-X-152-00`
`529`		`- Writer.WriteElementString("ram", "ModeCode", String.Format("{0}", EnumExtensions.EnumToInt<TransportModeCodes>(this.Descriptor.TransportMode ?? TransportModeCodes.Unknown))); // BT-X-152`
	`529`	`+ Writer.WriteElementString("ram", "ModeCode", EnumExtensions.EnumToString<TransportModeCodes>(this.Descriptor.TransportMode)); // BT-X-152`
`530`	`530`	`Writer.WriteEndElement(); // !ram:SpecifiedLogisticsTransportMovement`
`531`	`531`	`Writer.WriteEndElement(); // !ram:RelatedSupplyChainConsignment`
`532`	`532`	`}`
Original file line number	Diff line number	Diff line change
`@@ -717,7 +717,7 @@ public override void Save(InvoiceDescriptor descriptor, Stream stream, ZUGFeRDFo`
`717`	`717`	`{`
`718`	`718`	`Writer.WriteStartElement("ram", "RelatedSupplyChainConsignment", Profile.Extended); // BG-X-24`
`719`	`719`	`Writer.WriteStartElement("ram", "SpecifiedLogisticsTransportMovement", Profile.Extended); // BT-X-152-00`
`720`		`- Writer.WriteElementString("ram", "ModeCode", String.Format("{0}", EnumExtensions.EnumToInt<TransportModeCodes>(this.Descriptor.TransportMode ?? TransportModeCodes.Unknown))); // BT-X-152`
	`720`	`+ Writer.WriteElementString("ram", "ModeCode", EnumExtensions.EnumToString<TransportModeCodes>(this.Descriptor.TransportMode)); // BT-X-152`
`721`	`721`	`Writer.WriteEndElement(); // !ram:SpecifiedLogisticsTransportMovement`
`722`	`722`	`Writer.WriteEndElement(); // !ram:RelatedSupplyChainConsignment`
`723`	`723`	`}`