Release 2.0.25+4

SCPN1-11090

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

RFXtoRP_HsrReceiptList.ftl

@@ -102,6 +102,7 @@
                 <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
                 }
               <#else>
+                <#if receipt.line_list ?? && receipt.line_list[0]??>
                   {
                   <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
                   "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -114,6 +115,9 @@
                   "datas" :
                   <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
                   }
+                  <#else>
+                    <#stop> <#-- No line -->
+                  </#if>
               </#if>
             <#else>
               <#if receipt.receipt_confirmed?? && receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
@@ -138,6 +142,7 @@
                       <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
                     }
                   <#else>
+                    <#if receipt.line_list ?? && receipt.line_list[0]??>
                     {
                       <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
                       "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -150,10 +155,14 @@
                       "datas" :
                       <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
                     }
+                    <#else>
+                      <#stop> <#-- No line -->
+                    </#if>
                   </#if>
                 <#else>
                   <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "false" && receipt.line_list?? && receipt.line_list[0]??>
                     <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+                      <#if receipt.line_list ?? && receipt.line_list[0]??>
                     [
                       {
                         <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
@@ -168,6 +177,9 @@
                         <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">
                       }
                     ]
+                      <#else>
+                        <#stop> <#-- No line -->
+                      </#if>
                     <#else>
                       <#stop> <#-- Receipt reference for transfer is empty-->
                     </#if>
@@ -186,7 +198,7 @@
                       <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
                       }
                     <#else>
-                      <#stop>
+                      <#stop> <#-- No line -->
                     </#if>
                   </#if>
                 </#if>

RFXtoRP_PlatformLogCreate.ftl

@@ -1,7 +1,16 @@
 <#include "HfRpConfig.ftl">
 [
     <#assign UUID = UUID.randomUUID()>
-    <#assign strJsonBody = JsonUtil.espaceQuoteInJsonString(restResponseBody)>
+    <#assign strJsonBody = JsonUtil.espaceQuoteInJsonString(restResponseBody)?replace("\n", "")?replace("\r", "")>
+    <#assign maxLen = 32000>
+    <#if strJsonBody?length gt maxLen>
+        <#assign strJsonBody = JsonUtil.espaceQuoteInJsonString(restResponseBody)?replace("\n", "")?replace("\r", "")?replace('"logical_key_list"\\s*:\\s*\\[[^\\]]*\\]', '"logical_key_list": []', 'r')>
+    </#if>
+    <#if strJsonBody?length gt maxLen>
+        <#assign safeJsonBody = "{\"truncated\": true, \"original_size\": " + strJsonBody?length + "}">
+    <#else>
+        <#assign safeJsonBody = strJsonBody>
+    </#if>
 	{
 	  "Header": {
 	    "ProjectID": "${projectRP}"
@@ -23,21 +32,20 @@
 	    },
 	    "TechMessage": {
 	      "Code": "${restResponsetMsg.status!"no Code"}",
-	      "Label": ${strJsonBody?truncate(32000,'...')}
+      "Label": "${safeJsonBody?json_string}"
 	      },
 	    "UserMessage": {
 	      "Code": "${restResponsetMsg.status!"no Code"}",
-	      "Label": ${strJsonBody?truncate(32000,'...')},
+          "Label": "${safeJsonBody?json_string}",
 	      "Params": []
 	    },
 	    "DetailElements": [],
 	    "CorrelationID": "${id.correlationid!"no Correlationid"}",
-	    "ContextPayload": ${strJsonBody?truncate(32000,'...')},
+	    "ContextPayload": "${safeJsonBody?json_string}",
 	    "Type": "${event}",
 	    "Task": "${id.apiRestReflexID!"no Task"}",
 	    "OriginalID": "${id.refid!"no OriginalID"?trim?json_string}",
 	    "StackTrace": ""
 	  }
 	}
-
 ]

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+2
+2.0.25+4