Release 1.2.9+1

Merge branch 'SCPN1-5651' into 'release/1.2'
Resolve SCPN1-5651 See merge request r-d-technique/tiers/reflex-wms-connector!7
2024-01-10 10:40:42 +01:00 · 2024-01-10 09:33:49 +00:00 · 2024-01-09 17:17:26 +01:00 · 2024-01-03 14:42:40 +01:00 · 2024-01-03 13:32:45 +01:00 · 2023-12-06 15:48:59 +01:00
7 changed files with 17 additions and 156 deletions
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -29,52 +29,22 @@
         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
         "datas" :         
          <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">          
-         },
-
-         <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" >
-          {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated> 
-         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :         
-          <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl">     
-         },
-         {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCarrierUpdated> 
-         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :         
-          <#include "RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl">          
-         },
-         </#if>
-
-        
+         }
          <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line>
          <#list preparation_line.despatched_ipg_list as despatched_ipg>
+          <#if despatched_ipg.consignment_unit_id != ""> 
+            ,
            {
            <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> 
            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
            "datas" :         
            <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">          
            }
-
-          <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number >
-          ,
-         {
-           
-
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded> 
-         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :         
-          <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl">
-         }
          </#if>
-         <#sep>,</#sep>
-            </#list>
-           <#sep>,</#sep>
-          </#list>
-
 
+            </#list>
+          </#list>
       ]
-      
 <#else>
    <#stop "no confirmed quantity for the preparation - preparation closed">
 </#if>
--- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
@@ -1,23 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-[
- 
-  { 
-    "Header": {
-    "ProjectID": "${projectRP}"     
-    },
-    "ID":{
-    "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference}"
-    },
-  "Payload":{
-    "Carrier": {
-        "ActorID":"${preparationOrder.load_data.carrier_code}"
-    }
-    <#-- Add transport grade code 
-    <#if preparationOrder.transport_grade_code!="">
-    ,
-    "CarrierService":"${preparationOrder.transport_grade_code}"
-    </#if> -->
-  }
-  }
-]
--- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl
+++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl
@@ -19,26 +19,11 @@
      "Information" :{
        <#if despatched_ipg.carton_number != "000000000000000000"> 
           "ContainerType": "${despatched_ipg.carton_type_code}"
-           <#-- <#if preparation_line.despatched_cartons_list?? >
-              ,  
-              "Length": {
-              "Unit": "${length_unit_rfx}",
-              "Value": "${preparation_line.despatched_cartons_list.overall_depth}"
-              },
-              "Weight": {
-              "Unit": "${weight_unit_rfx}",
-              "Value": "${preparation_line.despatched_cartons_list.carton_gross_weight}"
-              },
-              "Width": {
-              "Unit": "${length_unit_rfx}",
-              "Value": "${preparation_line.despatched_cartons_list.overall_width}"
-              } 
-            </#if> -->
        <#else>
           "ContainerType": "${despatched_ipg.hd_type_code}"
        </#if>
-      },
      
+        },
     <#--  HU Metadata inclusin inclusion -->
    <#include "RFXtoRP_HsrPrepa_GoodsPrepared_HandlingUnitMetadata.ftl">  
    ,
@@ -93,7 +78,6 @@
            "LVID": "${quantity_in_base_lv_RP_Cst}",
            "Value": ${despatched_ipg.quantity_lvs}           
       }
-
      }
      ]
    }
--- a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl
@@ -1,37 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-[
- 
- { 
-    "Header": {
-    "ProjectID": "${projectRP}"     
-    },
-    "ID": {
-    "RefID": "${despatched_ipg.hd_number}"
-  },
-
- "Payload": {
-
-"IncludedHandlingunitIDs":  [ "${despatched_ipg.carton_number}" ]
-  <#if preparation_line.despatched_hds_list?? >
-      ,
-    "Information": {
-      "ContainerType": "${preparation_line.despatched_hds_list[0].hd_type_code}",
-      "Length": {
-        "Unit": "${length_unit_rfx}",
-        "Value": ${preparation_line.despatched_hds_list[0].hd_type_depth}
-      },
-      "Weight": {
-        "Unit": "${weight_unit_rfx}",
-        "Value": ${preparation_line.despatched_hds_list[0].hd_gross_weight}
-      },
-      "Width": {
-        "Unit": "${length_unit_rfx}",
-        "Value": ${preparation_line.despatched_hds_list[0].hd_type_width}
-      }      
-    }
-    </#if>
-
- }
- }
-]
--- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
@@ -1,18 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-[
- 
-  { 
-    "Header": {
-    "ProjectID": "${projectRP}"     
-    },
-    "ID":{
-    "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference}"
-    },
-  "Payload":{
-    "Carrier": {
-        "ActorID":"${preparationOrder.load_data.carrier_code}"
-    }
-  }
-  }
-]
--- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
+++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
@@ -7,15 +7,7 @@
    "ProjectID": "${projectRP}"     
    },
    "ID": {
-		<#if despatched_ipg.consignment_unit_id!="">
      "RefID": "${despatched_ipg.consignment_unit_id}"
-		<#else>
-			<#if despatched_ipg.carton_number != "000000000000000000"> 
-				"RefID": "${despatched_ipg.carton_number}"
-			<#else>
-				"RefID": "${despatched_ipg.hd_number}"
-			</#if>
-		</#if>	
      },
    "Payload": {
      <#if despatched_ipg.carton_number != "000000000000000000"> 
@@ -23,13 +15,6 @@
      <#else>
      "HandlingunitID": "${despatched_ipg.hd_number}"
      </#if>
-	  <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" >
-    ,
-	    "HUCarrier":{
-	    "ActorID": "${preparationOrder.load_data.carrier_code}"
-	  }
-
-	  </#if>
    }
  }
 ]
--- a/2
+++ b/2
@@ -1 +1 @@
-1.3.0-SNAPSHOT
+1.2.9+1
Author	SHA1	Message	Date
freat	fc8290648f	Release 1.2.9+1	2024-01-10 10:40:42 +01:00
Francis Reat	378c1ba75f	Merge branch 'SCPN1-5651' into 'release/1.2' Resolve SCPN1-5651 See merge request r-d-technique/tiers/reflex-wms-connector!7	2024-01-10 09:33:49 +00:00
frea	d94a74d399	Partial Merge branch 'develop' into SCPN1-5651	2024-01-09 17:17:26 +01:00
freat	a882ac4b86	Release 1.2.8+2	2024-01-03 14:42:40 +01:00
frea	d2d9443fc7	bug SCPN1-5632	2024-01-03 13:32:45 +01:00
Vincent Le Maitre	30ae93b9e7	Release 1.2.8+1	2023-12-06 15:48:59 +01:00
Vincent Le Maitre	64e03640d1	Release 1.2.7+2	2023-12-01 16:06:45 +01:00
Laurie Montant	270f90a9b3	Modif HsrPrepa 0112231019	2023-12-01 16:05:47 +01:00
Laurie Montant	b5c85220b5	Modifs FTL 2211231645	2023-12-01 16:05:36 +01:00
Laurie Montant	2409cf3a01	Modif FTL 2211231459	2023-12-01 16:05:11 +01:00
Laurie Montant	957df51487	Modifs FTL 2211231443	2023-12-01 16:04:57 +01:00
Laurie Montant	d09fa33577	Modif 2011231720 HsrPro	2023-12-01 16:04:46 +01:00
Laurie Montant	3bcdec1d5d	Modif alignement champs techniques Reflex HsrPro 2011231657	2023-12-01 16:04:35 +01:00
Vincent Le Maitre	b4ea1e7798	Release 1.2.7+1	2023-12-01 14:29:46 +01:00
Vincent LEMAITRE	80aecb3aa7	Update VERSION	2023-12-01 13:27:11 +00:00
Vincent Le Maitre	e02218f7b1	Release 1.2.6+2	2023-12-01 14:23:58 +01:00
Cedric Rodier	6270992346	Release 1.2.6+1	2023-11-23 10:02:38 +01:00
Vincent Le Maitre	a544f6700d	Release 1.2.6	2023-11-03 09:23:43 +01:00
Vincent Le Maitre	04ec57377a	Release 1.2.5	2023-10-24 16:47:19 +02:00
Vincent Le Maitre	b209e8b5e1	release 1.2.4	2023-10-24 08:22:11 +02:00