Release 1.2.23+1

SCPN1-6998

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

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}"
 

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}"
 

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_GoodsReceived.ftl

@@ -21,7 +21,7 @@
            "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}",
            "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}",
            <#if (priority_date!="") && (priority_date?starts_with("00")== false) >
-           "PriorityDate": "${priority_date}",
+              "PriorityDate": "${priority_date}",
            <#else>
               "PriorityDate": "1970-01-01T00:00:00Z",
             </#if>

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_HsaItmLv_LogisticVariantUpdated.ftl

@@ -16,8 +16,8 @@
           "Codes": [
                    <#list lv.id_list as id>
                    {
-                      "Key":   "${id.logistical_variant_ID_type_code?json_string!""}",
+                      "Key":   "${(id.logistical_variant_ID_type_code!"")?json_string}",
-                      "Value": "${id.logistical_variant_ID_code?json_string!""}"
+                      "Value": "${(id.logistical_variant_ID_code!"")?json_string}"
                    }<#sep>,</#sep>
                      </#list>
                    ],

RFXtoRP_HsaItm_ItemCreated.ftl

@@ -39,8 +39,8 @@
             "Codes": [
                        <#list logistical_variant.id_list as id>
                        {
-                          "Key":   "${id.logistical_variant_ID_type_code?json_string!""}",
+                          "Key":   "${(id.logistical_variant_ID_type_code!"")?json_string}",
-                          "Value": "${id.logistical_variant_ID_code?json_string!""}"
+                          "Value": "${(id.logistical_variant_ID_code!"")?json_string}"
                        }<#sep>,</#sep>
                          </#list>
                        ],

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}"
 

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}"
 

RFXtoRP_HsrPrepa_HUsAdded_Metadata.ftl

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

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_HsrPro_ExecutionflowDetected.ftl

@@ -52,23 +52,23 @@
           <#else>
             "Actor":
              {
-              "Name" : "${preparation_order.address.name_or_company_name?json_string!""}",
+              "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}",
               "Address" :
                 {
-                 "City" : "${preparation_order.address.post_code_area_name?json_string!""}",
+                 "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}",
                  "CountryCode" : "${preparation_order.address.iso_country_code!""}",
                  "PostalCode" : "${preparation_order.address.postal_code!""}",
-                 "StreetAddressOne" : "${preparation_order.address.street_and_number_and_po_box?json_string!""}",
+                 "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}",
-                 "StreetAddressTwo" : "${preparation_order.address.additional_address_data_1?json_string!""}",
+                 "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}",
-                 "StreetAddressThree" : "${preparation_order.address.additional_address_data_2?json_string!""}"
+                 "StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}"
                  }
                   },
               "Contact" :
                 {
-                  "FirstName" : "${preparation_order.address.first_name?json_string!""}",
+                  "FirstName" : "${(preparation_order.address.first_name!"")?json_string}",
-                  "LastName" : "${preparation_order.address.last_name?json_string!""}",
+                  "LastName" : "${(preparation_order.address.last_name!"")?json_string}",
-                  "Emails" : ${splitEmailsIntoArray(preparation_order.address.mail_address!""?json_string)},
+                  "Emails" : ${splitEmailsIntoArray((preparation_order.address.mail_address!"")?json_string)},
-                  "Phones" : ["${preparation_order.address.mobile_phone_number?json_string!""}","${preparation_order.address.land_line_phone_number?json_string!""}", "${preparation_order.address.fax_number?json_string!""}" ]
+                  "Phones" : ["${(preparation_order.address.mobile_phone_number!"")?json_string}","${(preparation_order.address.land_line_phone_number!"")?json_string}", "${(preparation_order.address.fax_number!"")?json_string}" ]
                 }
           </#if>
          },

RFXtoRP_PrepOrder_ShipFromAcked.ftl

@@ -4,7 +4,7 @@
 	    "ProjectID": "${projectRP}"
 	  },
 	  "ID": {
-	       "RefID": "${id.refid}"
+	       "RefID": "${id.refid?json_string}"
 	  },
 
 	  "Payload": {

RFXtoRP_Receipt_ShipToAcked.ftl

@@ -4,7 +4,7 @@
 	    "ProjectID": "${projectRP}"	   
 	  },
 	  "ID": {
-	       "RefID": "${id.refid}"
+	       "RefID": "${id.refid?json_string}"
 	  },
 	   
 	  "Payload": {

RFXtoRP_RestResponse.ftl

@@ -28,22 +28,33 @@
 								<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">
 						   }
 					   ]
-				   <#else>
+					<#else>
-				   [
+						<#if preparationOrderPostResponse.status?? &&  preparationOrderPostResponse.status == "WARN">
-					   {
+							[
-					     <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+							{
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
+								<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked>
-						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+								"apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						 "datas" :
+								"datas" :
-							<#include "RFXtoRP_PlatformLogCreate.ftl">
+									<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">
-					   },
+							}
-					   {
+							]
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+				  		 <#else>
-						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						[
-						 "datas" :
+							{
-							<#include "RFXtoRP_RestResponseAllocationError.ftl">
+								<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-					   }
+								<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
-				   ]
+								"apiReflexPlatformID" :  "${apiReflexPlatformID}",
+								"datas" :
+									<#include "RFXtoRP_PlatformLogCreate.ftl">
+							},
+							{
+								<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+								"apiReflexPlatformID" :  "${apiReflexPlatformID}",
+								"datas" :
+									<#include "RFXtoRP_RestResponseAllocationError.ftl">
+							}
+						]
+				   		</#if>
 				   </#if>
 				   <#break>
 	           <#default>

RPtoRFX_PrepOrder.ftl

@@ -52,21 +52,21 @@
 				"title_code" : "${titlecode}",
 				"contact_type_code" : "${contacttypecode}",
 				"address_type_code" : "${adresstypecode}",
-				"first_name": "${executionflow.ShipTo.Contact.FirstName!""?json_string}",
+				"first_name": "${(executionflow.ShipTo.Contact.FirstName!"")?json_string}",
-				"last_name" :"${executionflow.ShipTo.Contact.LastName!""?json_string}",
+				"last_name" :"${(executionflow.ShipTo.Contact.LastName!"")?json_string}",
-				"name_or_company_name" : "${executionflow.ShipTo.Contact.FirstName!""?json_string} ${executionflow.ShipTo.Contact.LastName!""?json_string}",
+				"name_or_company_name" : "${(executionflow.ShipTo.Contact.FirstName!"")?json_string} ${(executionflow.ShipTo.Contact.LastName!"")?json_string}",
 				<#if executionflow.ShipTo.Contact.Emails?? && executionflow.ShipTo.Contact.Emails[0]!="">
 					"mail_address": "${executionflow.ShipTo.Contact.Emails[0]}",
 				</#if>
 				<#if executionflow.ShipTo.Contact.Phones?? && executionflow.ShipTo.Contact.Phones[0]!="">
 					"mobile_phone_number": "${executionflow.ShipTo.Contact.Phones[0]}",
 				</#if>
-				"street_and_number_and_po_box": "${executionflow.ShipTo.Actor.Address.StreetAddressOne!""?json_string}",
+				"street_and_number_and_po_box": "${(executionflow.ShipTo.Actor.Address.StreetAddressOne!"")?json_string}",
-				"additional_address_data_1": "${executionflow.ShipTo.Actor.Address.StreetAddressTwo!""?json_string}",
+				"additional_address_data_1": "${(executionflow.ShipTo.Actor.Address.StreetAddressTwo!"")?json_string}",
-				"additional_address_data_2": "${executionflow.ShipTo.Actor.Address.StreetAddressThree!""?json_string}",
+				"additional_address_data_2": "${(executionflow.ShipTo.Actor.Address.StreetAddressThree!"")?json_string}",
-				"postal_code": "${executionflow.ShipTo.Actor.Address.PostalCode!""}",
+				"postal_code": "${(executionflow.ShipTo.Actor.Address.PostalCode!"")?json_string}",
-				"post_code_area_name" : "${executionflow.ShipTo.Actor.Address.City!""}",
+				"post_code_area_name" : "${(executionflow.ShipTo.Actor.Address.City!"")?json_string}",
-				"iso_country_code": "${executionflow.ShipTo.Actor.Address.CountryCode!""}"
+				"iso_country_code": "${(executionflow.ShipTo.Actor.Address.CountryCode!"")?json_string}"
 			}
 		</#if>
 		<#if executionflow.Lines??>

VERSION

@@ -1 +1 @@
-1.2.17+1
+1.2.23+1