Release 1.2.27+1

SCPN1-7155

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

RFXtoRP_HsaCarrier_ActorCreated.ftl

@@ -29,7 +29,12 @@
           "StreetAddressTwo" : "${carrier.carrier_structured_address.additionnal_data?json_string}",
           "PostalCode" : "${carrier.carrier_structured_address.postal_code?json_string}",
           "City" : "${carrier.carrier_structured_address.post_code_area_name?json_string}",
-          "CountryCode" : "${carrier.carrier_structured_address.country_code?json_string}",
+          <#assign isCountryCode = JsonUtil.isCountryCode(carrier.carrier_structured_address.country_code?upper_case) />
+          <#if isCountryCode>
+            "CountryCode" : "${carrier.carrier_structured_address.country_code?upper_case?json_string}",
+          <#else>
+            "CountryCode" : "",
+          </#if>
 			    "ProvinceCode": "${carrier.carrier_structured_address.territorial_div_code?json_string}",
 			    "State": "${carrier.carrier_structured_address.country_designation?json_string}"
 
@@ -39,7 +44,8 @@
             "Name": "${carrier.address.company_name?json_string}",
             "StreetAddressOne" : "${carrier.address.address_1?json_string}",
             "StreetAddressTwo" : "${carrier.address.address_2?json_string}",
-            "StreetAddressThree" : "${carrier.address.address_3?json_string}"
+            "StreetAddressThree" : "${carrier.address.address_3?json_string}",
+			"CountryCode" : ""
           </#if>
         </#if>
          },

RFXtoRP_HsaCons_ActorCreated.ftl

@@ -29,7 +29,12 @@
         "StreetAddressTwo" : "${actor.consignee_structured_address.additionnal_data?json_string}",
         "PostalCode" : "${actor.consignee_structured_address.postal_code?json_string}",
         "City" : "${actor.consignee_structured_address.post_code_area_name?json_string}",
-        "CountryCode" : "${actor.consignee_structured_address.country_code?json_string}",
+        <#assign isCountryCode = JsonUtil.isCountryCode(actor.consignee_structured_address.country_code?upper_case) />
+         <#if isCountryCode>
+        "CountryCode" : "${actor.consignee_structured_address.country_code?upper_case?json_string}",
+          <#else>
+            "CountryCode" : "",
+          </#if>
 			  "ProvinceCode": "${actor.consignee_structured_address.territorial_div_code?json_string}",
 			  "State": "${actor.consignee_structured_address.country_designation?json_string}"
 
@@ -40,7 +45,8 @@
             "Name": "${actor.address.company_name?json_string}",
             "StreetAddressOne" : "${actor.address.address_1?json_string}",
             "StreetAddressTwo" : "${actor.address.address_2?json_string}",
-            "StreetAddressThree" : "${actor.address.address_3?json_string}"
+            "StreetAddressThree" : "${actor.address.address_3?json_string}",
+			 "CountryCode" : ""
           </#if>
         </#if>
        },

RFXtoRP_HsaIpgMove.ftl

@@ -24,6 +24,8 @@
             reflexMvtStockInterface.ipg_move_type == "260" ||
             reflexMvtStockInterface.ipg_move_type == "290" ||
             reflexMvtStockInterface.ipg_move_type == "300" ||
+            reflexMvtStockInterface.ipg_move_type == "350" ||
+            reflexMvtStockInterface.ipg_move_type == "370" ||
             reflexMvtStockInterface.ipg_move_type == "400" ||
             reflexMvtStockInterface.ipg_move_type == "410" ||
             reflexMvtStockInterface.ipg_move_type == "420"

RFXtoRP_HsaIpgMove_StockMoved.ftl

@@ -10,6 +10,8 @@
             "260":"STOCK_MOVEMENT_TYPE_REQUALIFICATION",
             "290":"STOCK_MOVEMENT_TYPE_REQUALIFICATION",
             "300":"STOCK_MOVEMENT_TYPE_REQUALIFICATION",
+            "350":"STOCK_MOVEMENT_TYPE_USE_OF_GOODS",
+            "370":"STOCK_MOVEMENT_TYPE_USE_OF_GOODS",
             "400":"STOCK_MOVEMENT_TYPE_FIX",
             "410":"STOCK_MOVEMENT_TYPE_FIX",
             "420":"STOCK_MOVEMENT_TYPE_REQUALIFICATION"}>

RFXtoRP_HsaSup_ActorCreated.ftl

@@ -28,7 +28,12 @@
           "StreetAddressTwo" : "${actor.supplier_structured_address.additionnal_data?json_string}",
          "PostalCode" : "${actor.supplier_structured_address.postal_code?json_string}",
           "City" : "${actor.supplier_structured_address.post_code_area_name?json_string}",
-          "CountryCode" : "${actor.supplier_structured_address.country_code?json_string}",
+          <#assign isCountryCode = JsonUtil.isCountryCode(actor.supplier_structured_address.country_code?upper_case) />
+          <#if isCountryCode>
+            "CountryCode" : "${actor.supplier_structured_address.country_code?upper_case?json_string}",
+		  <#else>
+            "CountryCode" : "",
+          </#if>
 			    "ProvinceCode": "${actor.supplier_structured_address.territorial_div_code?json_string}",
 			    "State": "${actor.supplier_structured_address.country_designation?json_string}"
 
@@ -38,7 +43,8 @@
             "Name": "${actor.optional_attributes.company_name?json_string}",
             "StreetAddressOne" : "${actor.optional_attributes.address_1?json_string}",
             "StreetAddressTwo" : "${actor.optional_attributes.address_2?json_string}",
-            "StreetAddressThree" : "${actor.optional_attributes.address_3?json_string}"
+            "StreetAddressThree" : "${actor.optional_attributes.address_3?json_string}",
+			"CountryCode" : ""
           </#if>
         </#if>
 

RFXtoRP_HsrDepot_ActorCreated.ftl

@@ -28,7 +28,12 @@
           "StreetAddressTwo" : "${depot.physical_depot_structured_address.additionnal_data?json_string}",
           "PostalCode" : "${depot.physical_depot_structured_address.postal_code?json_string}",
           "City" : "${depot.physical_depot_structured_address.post_code_area_name?json_string}",
-          "CountryCode" : "${depot.physical_depot_structured_address.country_code?json_string}",
+          <#assign isCountryCode = JsonUtil.isCountryCode(depot.physical_depot_structured_address.country_code?upper_case) />
+          <#if isCountryCode >
+            "CountryCode" : "${depot.physical_depot_structured_address.country_code?upper_case?json_string}",
+          <#else>
+            "CountryCode" : "",
+          </#if>
 			    "ProvinceCode": "${depot.physical_depot_structured_address.territorial_div_code?json_string}",
 			    "State": "${depot.physical_depot_structured_address.country_designation?json_string}"
 
@@ -37,7 +42,8 @@
           "Name": "${depot.physical_depot_address.company_name?json_string}",
           "StreetAddressOne" : "${depot.physical_depot_address.address_1?json_string}",
           "StreetAddressTwo" : "${depot.physical_depot_address.address_2?json_string}",
-          "StreetAddressThree" : "${depot.physical_depot_address.address_3?json_string}"
+          "StreetAddressThree" : "${depot.physical_depot_address.address_3?json_string}",
+		  "CountryCode" : ""
         </#if>
 
          },

RFXtoRP_HsrPrepa.ftl

@@ -49,10 +49,13 @@
             </#if>
 
             <#assign refIDHmap ={}>
+            <#assign hd_numberHmap ={}>
             <#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!="">
+               <#if !hd_numberHmap[despatched_ipg.hd_number]?? >
+                  <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
                   ,
                   {
                   <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
@@ -61,6 +64,7 @@
                   <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">
                   }
                   </#if>
+            </#if>
             <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number >
                ,
                {

RFXtoRP_HsrPrepa_HUsAdded_Metadata.ftl

@@ -0,0 +1,9 @@
+<#-- use protobuf of class HsrPrepa to find Reflex WMS fields names  -->
+
+<#--
+"MetaData" :[
+
+          ]
+
+-->
+"MetaData": [            ]

RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl

@@ -74,12 +74,9 @@
        "Goods": {
            "ItemID": "${preparation_line.item_code?trim?json_string}",
            "LVBranchID": "${preparation_line.item_lv_code?json_string}",
-           <#if (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00") == false)>
+           
-              <#assign priority_date = despatched_ipg.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc />
+             <#if (despatched_ipg.ipg_use_by_date?length != 0) && (despatched_ipg.ipg_use_by_date?starts_with("00")== false)>
-              "PriorityDate": "${priority_date}",
+				<#assign priority_date = despatched_ipg.ipg_use_by_date?datetime(rfx_date_format_default)?iso_utc />
-                <#else>
-                  <#if (despatched_ipg.ipg_receipt_date?length != 0) && (despatched_ipg.ipg_receipt_date?starts_with("00")== false)>
-                    <#assign priority_date = despatched_ipg.ipg_receipt_date?datetime(rfx_date_format_default)?iso_utc />
 				"PriorityDate": "${priority_date}",
              <#else>
 				<#if (despatched_ipg.ipg_best_before_date?length != 0) && (despatched_ipg.ipg_best_before_date?starts_with("00")== false)>
@@ -90,8 +87,12 @@
 						<#assign priority_date = despatched_ipg.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc />
                         "PriorityDate": "${priority_date}",
 					<#else>
-                                    <#if (despatched_ipg.ipg_use_by_date?length != 0) && (despatched_ipg.ipg_use_by_date?starts_with("00")== false)>
+						<#if (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00") == false)>
-                                      <#assign priority_date = despatched_ipg.ipg_use_by_date?datetime(rfx_date_format_default)?iso_utc />
+							<#assign priority_date = despatched_ipg.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc />
+							"PriorityDate": "${priority_date}",
+						<#else>
+							<#if (despatched_ipg.ipg_receipt_date?length != 0) && (despatched_ipg.ipg_receipt_date?starts_with("00")== false)>
+								<#assign priority_date = despatched_ipg.ipg_receipt_date?datetime(rfx_date_format_default)?iso_utc />
 								"PriorityDate": "${priority_date}",
 							<#else>
 								<#if (preparationOrder.stock_despatch_at_preparation_datetime?length != 0) && (preparationOrder.stock_despatch_at_preparation_datetime?starts_with("00")== false)>

RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl

@@ -33,7 +33,10 @@
         "Value": ${preparation_line.despatched_hds_list[0].hd_type_width}
       }
     }
-    </#if>
+    </#if>,
+ <#--  HU Metadata inclusin inclusion -->
+    <#include "RFXtoRP_HsrPrepa_HUsAdded_Metadata.ftl">
+
 
  }
  }

RFXtoRP_RestResponse.ftl

@@ -28,6 +28,16 @@
 								<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">
 						   }
 					   ]
+					<#else>
+						<#if preparationOrderPostResponse.status?? &&  preparationOrderPostResponse.status == "WARN">
+							[
+							{
+								<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked>
+								"apiReflexPlatformID" :  "${apiReflexPlatformID}",
+								"datas" :
+									<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">
+							}
+							]
 				  		 <#else>
 						[
 							{
@@ -45,6 +55,7 @@
 							}
 						]
 				   		</#if>
+				   </#if>
 				   <#break>
 	           <#default>
 				   [

VERSION

@@ -1 +1 @@
-1.2.17+2
+1.2.27+1