Merge branch 'release/2.0' into 'main-2.0'

SCPN1-11014

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

RFXtoRP_HsaProStatus.ftl

@@ -17,7 +17,15 @@
       <#assign preparationStatusInterface = JsonUtil.jsonToMap(dataRfx) />
       [
          <#if preparationStatusInterface.preparation_type_code=="010" || preparationStatusInterface.preparation_type_code=="030">
-         <#--**Pick batch runned (200) **-->
+         <#--**Generation (100) **-->
+         <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "100" >
+            {
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCustomFieldsUpdated>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsaProStatus_ExecutionflowCustomFieldsUpdated.ftl">
+            }
+            <#else>
                <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" >
                   {
                   <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected>
@@ -64,6 +72,7 @@
                      </#if>
                   </#if>
                </#if>
+            </#if>
          <#else>
             <#stop >
          </#if>

RFXtoRP_HsaProStatus_ExecutionflowCustomFieldsUpdated.ftl

@@ -0,0 +1,52 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#include "ActorPrefix.ftl">
+[
+    {
+        "Header": {
+            "ProjectID": "${projectRP}"
+        },
+        "Payload" :{},
+        "ID":{
+            "CustomFields": [
+            {
+                "Key": "depot_code",
+                "Value": "${preparationStatusInterface.physical_depot_code?trim?json_string}"
+            },
+            {
+                "Key": "activity_code",
+                "Value": "${preparationStatusInterface.activity_code?trim?json_string}"
+            },
+            {
+                "Key": "originator_code",
+                "Value": "${preparationStatusInterface.preparation_order_originator_code?trim?json_string}"
+            },
+            {
+                "Key": "reference",
+                "Value": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}"
+            },
+            {
+                "Key": "order_year",
+                "Value": "${preparationStatusInterface.preparation_order_year}"
+            },
+             {
+                "Key": "order_number",
+                "Value": "${preparationStatusInterface.preparation_order_number}"
+            },
+             {
+                "Key": "preparation_year",
+                "Value": "${preparationStatusInterface.preparation_year}"
+            },
+             {
+                "Key": "preparation_number",
+                "Value": "${preparationStatusInterface.preparation_number}"
+            }
+        ],
+        <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
+            "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}"
+        <#else>
+            "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}"
+        </#if>
+        }
+    }
+]

RFXtoRP_HsrAntRec.ftl

@@ -16,6 +16,7 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign AncReceipt = JsonUtil.jsonToMap(dataRfx)>
         [
+         <#assign now = .now?string("yyyy-MM-dd'T'HH:mm:ss'Z'") />
          <#if AncReceipt.line_list?? && AncReceipt.line_list[0]??>
           {
             <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCreated>
@@ -23,6 +24,8 @@
             "datas" :
             <#include "RFXtoRP_HsrAntRec_Created.ftl">
           },
+          <#assign nowPlus1s = (.now?long + 1000)?number_to_datetime />
+          <#assign now = nowPlus1s?string("yyyy-MM-dd'T'HH:mm:ss'Z'") />
           {
             <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderReceiptExpected>
             "apiReflexPlatformID" :  "${apiReflexPlatformID}",

RFXtoRP_HsrAntRec_Created.ftl

@@ -5,7 +5,6 @@
 [
   {
     <#assign receipt_datetime = RfxDateTimetoUTCWithTimezone(AncReceipt.planned_receipt_datetime,time_zone_rfx) />
-    <#assign now = .now?string("yyyy-MM-dd'T'HH:mm:ss'Z'") />
     "Header": {
       "ProjectID": "${projectRP}"
     },
@@ -45,10 +44,14 @@
         }
         ],
         <#if AncReceipt.anticipated_receipt_reference?? && AncReceipt.anticipated_receipt_reference!="">
-            "RefID": "${AncReceipt.anticipated_receipt_reference?json_string}"
+            "RefID": "${AncReceipt.anticipated_receipt_reference?json_string}",
         <#else>
-            "RefID": "AR-${AncReceipt.physical_depot_code?trim?json_string}${AncReceipt.activity_code?trim?json_string}${AncReceipt.originator_code?trim?json_string}${AncReceipt.anticipated_receipt_year?json_string}${AncReceipt.anticipated_receipt_number?json_string}"
+            "RefID": "AR-${AncReceipt.physical_depot_code?trim?json_string}${AncReceipt.activity_code?trim?json_string}${AncReceipt.originator_code?trim?json_string}${AncReceipt.anticipated_receipt_year?json_string}${AncReceipt.anticipated_receipt_number?json_string}",
         </#if>
+            "RefDate": {
+                "DateTime": "${now}",
+                "AuthorTimeZone": "${time_zone_rfx}"
+            }
     },
     "Payload": {
         "ShipFrom": {

VERSION

@@ -1 +1 @@
-2.0.25+1
+2.0.25+2