Release 1.2.15+6

modifs hsrpro SCPN1-6374

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

RFXtoRP_HsrPrepa.ftl

@@ -2,7 +2,7 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
-
+<#include "ReflexUtils.ftl">
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
@@ -49,6 +49,7 @@
 
             <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
             <#list preparation_line.despatched_ipg_list as despatched_ipg>
+            <#assign HUadded_packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) />
             <#if despatched_ipg.consignment_unit_id!="">
                ,
                {

RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl

@@ -1,24 +1,24 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
-<#assign dispatched_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line2>
-    <#list preparation_line2.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg2>
+<#assign dispatched3_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line3>
+    <#list preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg3>
     {
     "Header": {
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${despatched_ipg2.carton_number}",
+      "RefID": "${despatched_ipg3.carton_number}",
       "RefDate": {
-        "DateTime": "${dispatched_datetime}",
+        "DateTime": "${dispatched3_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"
       }
       },
       "Payload": { }
       }<#sep>,</#sep>
       </#list>
-  <#if preparation_line2.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000")?size!=0 >
+  <#if preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000")?size!=0 >
   <#sep>,</#sep>
   </#if>
   </#list>

RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl

@@ -1,13 +1,17 @@
 <#include "HfRpConfig.ftl">
-
 [
   <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
     <#list preparation_line.despatched_ipg_list as despatched_ipg>
+    <#assign packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) />
     {
     "Header": {
       "ProjectID": "${projectRP}"
     },
     "ID": {
+       "RefDate": {
+      "AuthorTimeZone": "${time_zone_rfx}",
+      "DateTime": "${packing_datetime}"
+    },
       <#if despatched_ipg.carton_number != "000000000000000000">
         "RefID": "${despatched_ipg.carton_number}"
       <#else>

RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl

@@ -1,12 +1,15 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
-
  {
     "Header": {
     "ProjectID": "${projectRP}"
     },
     "ID": {
+      "RefDate": {
+      "AuthorTimeZone": "${time_zone_rfx}",
+      "DateTime": "${HUadded_packing_datetime}"
+    },
     "RefID": "${despatched_ipg.hd_number}"
   },
 

RFXtoRP_HsrPro.ftl

@@ -16,16 +16,18 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
        [
-         {
+
         <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
           <#-- check preparation type code (internal order and reservation are ignored)  -->
           <#if preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030">
             <#-- Only if preparation order not confirmed  -->
             <#if preparation_order.preparation_order_confirmed == "false" >
+            {
               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
               "datas" :
               <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">
+            }
             <#else>
             <#stop "preparation order already confirmed">
            </#if>
@@ -36,7 +38,7 @@
         <#else>
           <#stop "PRO reference is empty">
         </#if>
-         }
+
 
        ]
   <#break>
@@ -46,18 +48,16 @@
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
        [
-        {
         <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
-          {
+        {
           <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :
           <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl">
-          }
+        }
         <#else>
           <#stop "PRO reference is empty">
         </#if>
-        }
        ]
          <#break>
 

VERSION

@@ -1 +1 @@
-1.2.15+3
+1.2.15+6