Release 2.0.25+6

Resolve SCPN1-11254 "Release 2.0  "

See merge request r-d-technique/tiers/reflex-wms-connector!315

RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl

@@ -34,7 +34,7 @@
                 "Key": "order_number",
                 "Value": "${receipt.receipt_number}"
             },
-            <#if receipt.line_list[0]?? && receipt.line_list[0].line_anticipated?? && receipt.line_list[0].line_anticipated.anticipated_receipt_year!=0 && receipt.line_list[0].line_anticipated.anticipated_receipt_number!=0 >
+            <#if receipt.line_list?? && receipt.line_list[0]?? && receipt.line_list[0].line_anticipated?? && receipt.line_list[0].line_anticipated.anticipated_receipt_year!=0 && receipt.line_list[0].line_anticipated.anticipated_receipt_number!=0 >
             {
                 "Key": "anticipated",
                 "Value": "true"
@@ -74,7 +74,7 @@
          "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}"
       },
       "ShipToAcked": true,
-      <#if receipt.line_list[0]?? && receipt.line_list[0].line_anticipated?? && receipt.line_list[0].line_anticipated.anticipated_receipt_year!=0 && receipt.line_list[0].line_anticipated.anticipated_receipt_reference?? && receipt.line_list[0].line_anticipated.anticipated_receipt_reference=="" >
+      <#if receipt.line_list?? && receipt.line_list[0]?? && receipt.line_list[0].line_anticipated?? && receipt.line_list[0].line_anticipated.anticipated_receipt_year!=0 && receipt.line_list[0].line_anticipated.anticipated_receipt_reference?? && receipt.line_list[0].line_anticipated.anticipated_receipt_reference=="" >
         "OrderID":"AR-${receipt.line_list[0].line_anticipated.anticipated_receipt_depot_code?trim?json_string}${receipt.line_list[0].line_anticipated.anticipated_receipt_activity_code?trim?json_string}${receipt.line_list[0].line_anticipated.anticipated_receipt_originator_code?trim?json_string}${receipt.line_list[0].line_anticipated.anticipated_receipt_year}${receipt.line_list[0].line_anticipated.anticipated_receipt_number}",
       <#else>
         <#if receipt.receipt_reference?? && receipt.receipt_reference!="">

RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl

@@ -37,7 +37,18 @@
              {
                 "Key": "order_number",
                 "Value": "${receipt.receipt_number}"
+            },
+            <#if receipt.line_list?? && receipt.line_list[0]?? && receipt.line_list[0].line_anticipated?? && receipt.line_list[0].line_anticipated.anticipated_receipt_year!=0 && receipt.line_list[0].line_anticipated.anticipated_receipt_number!=0 >
+            {
+                "Key": "anticipated",
+                "Value": "true"
             }
+            <#else>
+             {
+                "Key": "anticipated",
+                "Value": "false"
+            }
+            </#if>
         ],
           <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" && receipt.receipt_reference?? && receipt.receipt_reference!="">
             "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
@@ -140,6 +151,47 @@
             {
               "Header": {"ProjectID": "${projectRP}"},
             "ID": {
+              "CustomFields": [
+            {
+                "Key": "depot_code",
+                <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+                    "Value": "${receipt.origin_order_line_depot?trim?json_string}"
+                <#else>
+                    "Value": "${receipt.physical_depot_code?trim?json_string}"
+                </#if>
+            },
+            {
+                "Key": "activity_code",
+                "Value": "${receipt.activity_code?trim?json_string}"
+            },
+            {
+                "Key": "originator_code",
+                "Value": "${receipt.originator_code?trim?json_string}"
+            },
+            {
+                "Key": "reference",
+                "Value": "${receipt.receipt_reference?trim?json_string}"
+            },
+            {
+                "Key": "order_year",
+                "Value": "${receipt.receipt_year}"
+            },
+             {
+                "Key": "order_number",
+                "Value": "${receipt.receipt_number}"
+            },
+            <#if receipt.line_list?? && receipt.line_list[0]?? && receipt.line_list[0].line_anticipated?? && receipt.line_list[0].line_anticipated.anticipated_receipt_year!=0 && receipt.line_list[0].line_anticipated.anticipated_receipt_number!=0 >
+            {
+                "Key": "anticipated",
+                "Value": "true"
+            }
+            <#else>
+             {
+                "Key": "anticipated",
+                "Value": "false"
+            }
+            </#if>
+          ],
               <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
                 "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
               <#else>
@@ -226,6 +278,47 @@
             {
               "Header": {"ProjectID": "${projectRP}"},
               "ID": {
+                "CustomFields": [
+            {
+                "Key": "depot_code",
+                <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+                    "Value": "${receipt.origin_order_line_depot?trim?json_string}"
+                <#else>
+                    "Value": "${receipt.physical_depot_code?trim?json_string}"
+                </#if>
+            },
+            {
+                "Key": "activity_code",
+                "Value": "${receipt.activity_code?trim?json_string}"
+            },
+            {
+                "Key": "originator_code",
+                "Value": "${receipt.originator_code?trim?json_string}"
+            },
+            {
+                "Key": "reference",
+                "Value": "${receipt.receipt_reference?trim?json_string}"
+            },
+            {
+                "Key": "order_year",
+                "Value": "${receipt.receipt_year}"
+            },
+             {
+                "Key": "order_number",
+                "Value": "${receipt.receipt_number}"
+            },
+            <#if receipt.line_list?? && receipt.line_list[0]?? && receipt.line_list[0].line_anticipated?? && receipt.line_list[0].line_anticipated.anticipated_receipt_year!=0 && receipt.line_list[0].line_anticipated.anticipated_receipt_number!=0 >
+            {
+                "Key": "anticipated",
+                "Value": "true"
+            }
+            <#else>
+             {
+                "Key": "anticipated",
+                "Value": "false"
+            }
+            </#if>
+        ],
                   "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
                 "RefDate": {
                       "DateTime": "${receipt_creation_datetime}",

RFXtoRP_RestResponse.ftl

@@ -358,7 +358,7 @@
 			]
 			</#switch>
 			<#break>
-	<#-- *********************************************** ApiRestID = canceled ******************** -->
+	<#-- *********************************************** ApiRestID = status ******************** -->
 	<#case "status_appointment_put_update_by_ref">
 	<#case "status_appointment_put_update_by_number">
 		<#switch restResponsetMsg.status!no_status>

RPtoRFX_CarrierAppointmentCreated.ftl

@@ -38,7 +38,11 @@
 		<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING >
 			<#if appointment.Unloading?? && appointment.Unloading.Projects?? &&
 			appointment.Unloading.Projects[0]?? &&
-				appointment.Unloading.Projects[0].Commissions??>
+			appointment.Unloading.Projects[0].Commissions?? >
+				<#if (appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID!"") == "" &&
+				(appointment.Unloading.Projects[0].Commissions[0].OrderID!"") == "">
+					"appointment_designation":"${(appointment.Reason!"")!?json_string}",
+				<#else>
 					"physical_receipt_list": [
 					<#list appointment.Unloading.Projects[0].Commissions?filter(l ->l.ExecutionflowID?? && l.ExecutionflowID !="") as commission>
 					<#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.key == commission.ExecutionflowID && l.value?? && l.value?has_content) as custom>
@@ -70,8 +74,7 @@
 					<#sep>,</#sep>
 					</#list>
 					],
-			<#else>
+				</#if>
-				"appointment_designation":"${(appointment.Reason!"")!?json_string}",
 			</#if>
 		<#else>
 			<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING>

VERSION

@@ -1 +1 @@
-2.0.25+3
+2.0.25+6