Release 1.2.25+1

Release 1.2.24+1
Release 1.2.23+2
2024-08-08 16:55:33 +02:00 · 2024-08-07 12:23:46 +02:00 · 2024-08-07 08:44:43 +02:00 · 2024-08-07 06:43:11 +00:00 · 2024-08-07 08:38:34 +02:00 · 2024-08-06 16:08:37 +02:00
11 changed files with 78 additions and 27 deletions
--- a/RFXtoRP_HsaCarrier_ActorCreated.ftl
+++ b/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>
         },
--- a/RFXtoRP_HsaCons_ActorCreated.ftl
+++ b/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>
       },
--- a/RFXtoRP_HsaIpgMove.ftl
+++ b/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"
--- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
+++ b/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>
--- a/RFXtoRP_HsaIpgMove_StockMoved.ftl
+++ b/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"}>
--- a/RFXtoRP_HsaSup_ActorCreated.ftl
+++ b/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>

--- a/RFXtoRP_HsrDepot_ActorCreated.ftl
+++ b/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>

         },
--- a/RFXtoRP_HsrPrepa_HUsAdded_Metadata.ftl
+++ b/RFXtoRP_HsrPrepa_HUsAdded_Metadata.ftl
@@ -0,0 +1,9 @@
+<#-- use protobuf of class HsrPrepa to find Reflex WMS fields names  -->
+
+<#--
+"MetaData" :[
+
+          ]
+
+-->
+"MetaData": [            ]
--- a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl
+++ b/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">
+

 }
 }
--- a/RFXtoRP_RestResponse.ftl
+++ b/RFXtoRP_RestResponse.ftl
@@ -28,22 +28,33 @@
 								<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">
 						   }
 					   ]
-				   <#else>
-				   [
-					   {
-					     <#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">
-					   }
-				   ]
+					<#else>
+						<#if preparationOrderPostResponse.status?? &&  preparationOrderPostResponse.status == "WARN">
+							[
+							{
+								<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked>
+								"apiReflexPlatformID" :  "${apiReflexPlatformID}",
+								"datas" :
+									<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">
+							}
+							]
+				  		 <#else>
+						[
+							{
+								<#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>
--- a/2
+++ b/2
@@ -1 +1 @@
-1.2.17+2
+1.2.25+1
Author	SHA1	Message	Date
freat	087346139d	Release 1.2.25+1	2024-08-08 16:55:33 +02:00
freat	0a4263d551	Release 1.2.24+1	2024-08-07 12:23:46 +02:00
freat	b00302c8e3	Release 1.2.23+2	2024-08-07 08:44:43 +02:00
Francis Reat	55b7b54b44	Merge branch 'SCPN1-6998' into 'release/1.2' SCPN1-6998 See merge request r-d-technique/tiers/reflex-wms-connector!54	2024-08-07 06:43:11 +00:00
frea	26003c24f2	SCPN1-6998	2024-08-07 08:38:34 +02:00
freat	0468700574	Release 1.2.23+1	2024-08-06 16:08:37 +02:00
Francis Reat	fe35481144	Merge branch 'SCPN1-6998' into 'release/1.2' SCPN1-6998 See merge request r-d-technique/tiers/reflex-wms-connector!52	2024-08-06 13:48:36 +00:00
frea	d21204a949	SCPN1-6998	2024-08-06 15:41:22 +02:00
freat	46421972a8	Release 1.2.22+1	2024-07-29 17:33:09 +02:00
freat	ccca6d1592	Release 1.2.21+1	2024-07-29 17:32:32 +02:00
freat	68622896f0	Release 1.2.20+1	2024-07-24 10:47:24 +02:00
freat	fea5691ddd	Release 1.2.19+1	2024-07-22 10:18:15 +02:00
Francis Reat	2fb5dcd103	Merge branch 'SCPN1-6912' into 'release/1.2' Merge branch 'SCPN1-6564' into 'release/1.2' See merge request r-d-technique/tiers/reflex-wms-connector!48	2024-07-22 07:54:20 +00:00
frea	04253d939f	Merge branch 'develop' into SCPN1-6912	2024-07-19 11:24:12 +02:00
Laurie Montant	5c0b112c39	Modifs 170724	2024-07-17 11:07:36 +02:00
Laurie Montant	c3d1ceb0c5	ODP	2024-07-12 11:17:30 +02:00
freat	b80623e631	Release 1.2.18+1	2024-07-12 10:51:31 +02:00
Laurie Montant	45e8c4fee2	ajout MD HuAdded	2024-07-05 10:40:55 +02:00
frea	af29a11b22	adjust json_string	2024-06-25 17:29:36 +02:00
frea	74b976b367	adjust json_string	2024-06-24 16:20:09 +02:00
frea	044fda9d16	correction dans le cas où la commande n'a pas de ligne...	2024-06-21 13:28:44 +02:00
frea	e8510d079c	SCPN1-6605 MovementCreated	2024-06-07 11:15:47 +02:00
Francis Reat	aa19de32a5	Merge branch 'SCPN1-6692' into 'develop' SCPN1-6692 Closes SCPN1-6692 See merge request r-d-technique/tiers/reflex-wms-connector!43	2024-06-06 07:44:29 +00:00
frea	2524859cd4	SCPN1-6692	2024-06-06 09:15:09 +02:00
frea	06147dd8d4	SCPN1-6642 SCPN1-6641	2024-05-30 17:18:16 +02:00
Laurie Montant	9cbacc0ebc	priority date	2024-05-17 11:00:25 +02:00
Francis Reat	c31d6de4a2	Merge branch 'SCPN1-6564' into 'release/1.2' SCPN1-6564 See merge request r-d-technique/tiers/reflex-wms-connector!38 (cherry picked from commit `c0dd029d1f`)	2024-05-17 10:57:10 +02:00
Laurie Montant	b3da874dd3	modifs HUGP	2024-05-13 16:00:46 +02:00
Laurie Montant	82dfc05cdb	Création de commande	2024-04-24 15:09:45 +02:00
Laurie Montant	eda5fe4e07	modifs hsrprepa	2024-04-15 10:16:14 +02:00
Laurie Montant	26654a9820	modifs	2024-04-12 09:37:03 +02:00
Laurie Montant	6b6cef5332	modifs ipgmove	2024-04-11 11:01:05 +02:00
Laurie Montant	d7c9c72762	modifs hsrpro	2024-04-10 16:25:27 +02:00
Laurie Montant	87efb21e64	modifs ipg	2024-04-09 16:53:34 +02:00
@@ -1 +1 @@
 .2.17+2
 .2.25+1