Release 1.2.15+7

Merge branch 'versio-1.2.15' into 'release/1.2'
Modifs RPtoRFX 1701240947 SCPN1-6379 See merge request r-d-technique/tiers/reflex-wms-connector!31
2024-04-11 11:22:18 +02:00 · 2024-04-11 09:21:32 +00:00 · 2024-04-11 11:12:11 +02:00 · 2024-04-10 16:57:58 +02:00 · 2024-04-10 14:56:34 +00:00 · 2024-04-10 16:39:48 +02:00
3 changed files with 23 additions and 24 deletions
--- a/RFXtoRP_HsaIpgMove.ftl
+++ b/RFXtoRP_HsaIpgMove.ftl
@@ -14,8 +14,7 @@
      <#-- exclusion of the cases of an IPG move with quantity = 0 (weight modification) -->

      <#if reflexMvtStockInterface.ipg_move_quantity_in_base_lvs != 0>
-
-      <#-- IPG moves translated into Stock moves -->
+         <#-- IPG moves translated into Stock moves -->
         <#if reflexMvtStockInterface.ipg_move_type == "130" ||
            reflexMvtStockInterface.ipg_move_type == "200" ||
            reflexMvtStockInterface.ipg_move_type == "210" ||
@@ -41,22 +40,22 @@
            <#-- IPG moves translated into goods received (all type of  receipt)  -->
               <#if (reflexMvtStockInterface.ipg_move_type == "100" ||
                     reflexMvtStockInterface.ipg_move_type == "110" ||
-                     reflexMvtStockInterface.ipg_move_type == "120") && reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
-                  [
-                  {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived>
-                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                  "datas" :
-                  <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
-                  }
-                  ]
+                     reflexMvtStockInterface.ipg_move_type == "120") >
+                     <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
+                        [
+                        {
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived>
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        "datas" :
+                        <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
+                        }
+                        ]
+                      <#else>
+                        <#-- Case of IPG move type volontarilly ignored-->
+                        <#stop " Reference receipt is empty">
+                     </#if>
               <#else>
-                  <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
-                     <#-- Case of IPG move type volontarilly ignored-->
-                     <#stop " Reference receipt is empty">
-                  <#else>
-                     <#stop>
-                  </#if>
+                  <#stop>
               </#if>
         </#if>
      <#else>
--- a/RFXtoRP_HsrPro.ftl
+++ b/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>

--- a/2
+++ b/2
@@ -1 +1 @@
-1.2.15+5
+1.2.15+7
Author	SHA1	Message	Date
freat	37a5e64e83	Release 1.2.15+7	2024-04-11 11:22:18 +02:00
Francis Reat	2f31833bc3	Merge branch 'versio-1.2.15' into 'release/1.2' Modifs RPtoRFX 1701240947 SCPN1-6379 See merge request r-d-technique/tiers/reflex-wms-connector!31	2024-04-11 09:21:32 +00:00
Laurie Montant	cff0f18d8a	modifs ipgmove (cherry picked from commit `6b6cef5332`)	2024-04-11 11:12:11 +02:00
freat	22b78b4ffe	Release 1.2.15+6	2024-04-10 16:57:58 +02:00
Francis Reat	25bf3110e9	Merge branch 'versio-1.2.15' into 'release/1.2' modifs hsrpro SCPN1-6374 See merge request r-d-technique/tiers/reflex-wms-connector!29	2024-04-10 14:56:34 +00:00
Laurie Montant	0a32ead29a	modifs hsrpro (cherry picked from commit `d7c9c72762`)	2024-04-10 16:39:48 +02:00
@@ -1 +1 @@
 .2.15+5
 .2.15+7