reflex/reflex-wms-connector
0
Fork 0
Code Pull Requests Projects Releases Wiki Activity

Merge branch 'release/1.2' into 'main-1.2'

Browse Source 
SCPN1-10671

See merge request r-d-technique/tiers/reflex-wms-connector!287
This commit is contained in:
francis reat
2026-07-01 12:41:22 +00:00
parent f2b2994b0e 8011a7f2ea
commit 11b08fdb6d
10 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ActorPrefix.ftl
View File

@@ -38,7 +38,7 @@
<#local depot = actor> <#local depot = actor>
<#else> <#else>
<#if actor?length gt 4> <#if actor?length gt 4>
<#local depot = actor[4..]> <#local depot = actor[4..]>
<#else> <#else>
<#local depot = actor> <#local depot = actor>
</#if> </#if>
@@ -83,7 +83,7 @@
<#local supplier = actor> <#local supplier = actor>
<#else> <#else>
<#if actor?length gt 4> <#if actor?length gt 4>
<#local supplier = actor[4..]> <#local supplier = actor[4..]>
<#else> <#else>
<#local supplier = actor> <#local supplier = actor>
</#if> </#if>
@@ -126,7 +126,7 @@
<#local carrier = actor> <#local carrier = actor>
<#else> <#else>
<#if actor?length gt 4> <#if actor?length gt 4>
<#local carrier = actor[4..]> <#local carrier = actor[4..]>
<#else> <#else>
<#local carrier = actor> <#local carrier = actor>
</#if> </#if>
@@ -169,7 +169,7 @@
<#local consignee = actor> <#local consignee = actor>
<#else> <#else>
<#if actor?length gt 4> <#if actor?length gt 4>
<#local consignee = actor[4..]> <#local consignee = actor[4..]>
<#else> <#else>
<#local consignee = actor> <#local consignee = actor>
</#if> </#if>

4
RFXtoRP_HsaDesPatch.ftl
View File

@@ -17,7 +17,7 @@
<#assign desPatch = JsonUtil.jsonToMap(dataRfx)> <#assign desPatch = JsonUtil.jsonToMap(dataRfx)>
<#stop> <#stop>
<#break> <#break>
<#case "D"> <#case "D">
<#-- *********************************************** Action = DELETE ******************** --> <#-- *********************************************** Action = DELETE ******************** -->
@@ -25,7 +25,7 @@
<#assign desPatch = JsonUtil.jsonToMap(dataRfx)> <#assign desPatch = JsonUtil.jsonToMap(dataRfx)>
<#stop> <#stop>
<#break> <#break>
<#default> <#default>
<#stop > <#stop >
</#switch> </#switch>

4
RFXtoRP_HsaDespNt.ftl
View File

@@ -17,7 +17,7 @@
<#assign despNt = JsonUtil.jsonToMap(dataRfx)> <#assign despNt = JsonUtil.jsonToMap(dataRfx)>
<#stop> <#stop>
<#break> <#break>
<#case "D"> <#case "D">
<#-- *********************************************** Action = DELETE ******************** --> <#-- *********************************************** Action = DELETE ******************** -->
@@ -25,7 +25,7 @@
<#assign despNt = JsonUtil.jsonToMap(dataRfx)> <#assign despNt = JsonUtil.jsonToMap(dataRfx)>
<#stop> <#stop>
<#break> <#break>
<#default> <#default>
<#stop > <#stop >
</#switch> </#switch>

4
RFXtoRP_HsrLoadInfo.ftl
View File

@@ -18,14 +18,14 @@
<#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
<#assign depot = JsonUtil.jsonToMap(dataRfx)> <#assign depot = JsonUtil.jsonToMap(dataRfx)>
<#stop> <#stop>
<#break> <#break>
<#case "D"> <#case "D">
<#-- *********************************************** Action = DELETE *************************** --> <#-- *********************************************** Action = DELETE *************************** -->
<#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
<#assign depot = JsonUtil.jsonToMap(dataRfx)> <#assign depot = JsonUtil.jsonToMap(dataRfx)>
<#stop> <#stop>
<#break> <#break>
<#default> <#default>
<#stop > <#stop >

4
RFXtoRP_HsrPackBranch.ftl
View File

@@ -17,7 +17,7 @@
<#assign packBranch = JsonUtil.jsonToMap(dataRfx)> <#assign packBranch = JsonUtil.jsonToMap(dataRfx)>
<#stop> <#stop>
<#break> <#break>
<#case "D"> <#case "D">
<#-- *********************************************** Action = DELETE ******************** --> <#-- *********************************************** Action = DELETE ******************** -->
@@ -25,7 +25,7 @@
<#assign packBranch = JsonUtil.jsonToMap(dataRfx)> <#assign packBranch = JsonUtil.jsonToMap(dataRfx)>
<#stop> <#stop>
<#break> <#break>
<#default> <#default>
<#stop > <#stop >
</#switch> </#switch>

4
RFXtoRP_HsrPackOrder.ftl
View File

@@ -17,7 +17,7 @@
<#assign packOrder = JsonUtil.jsonToMap(dataRfx)> <#assign packOrder = JsonUtil.jsonToMap(dataRfx)>
<#stop> <#stop>
<#break> <#break>
<#case "D"> <#case "D">
<#-- *********************************************** Action = DELETE ******************** --> <#-- *********************************************** Action = DELETE ******************** -->
@@ -25,7 +25,7 @@
<#assign packOrder = JsonUtil.jsonToMap(dataRfx)> <#assign packOrder = JsonUtil.jsonToMap(dataRfx)>
<#stop> <#stop>
<#break> <#break>
<#default> <#default>
<#stop > <#stop >
</#switch> </#switch>

4
RPtoRFX_AppointmentEvent.ftl
View File

@@ -27,6 +27,10 @@
<#case "Updated"> <#case "Updated">
<#assign AddComma = false /> <#assign AddComma = false />
<#assign appointment = eventRP.data /> <#assign appointment = eventRP.data />
<#if !eventRP.commissionsUpdated!false && !eventRP.reasonUpdated!false && !eventRP.slotUpdated!false && !eventRP.carrierInformationUpdated!false>
<#stop>
</#if>
[ [
<#if appointment?? && (!(appointment.WMSCreated??) || !appointment.WMSCreated) && appointment.Status?? && appointment.Status.Current?? && appointment.Status.Current.StatusCode?? && appointment.Status.Current.StatusCode == AppointmentStatusCode.APPOINTMENT_0150_ALLOCATION_ERROR> <#if appointment?? && (!(appointment.WMSCreated??) || !appointment.WMSCreated) && appointment.Status?? && appointment.Status.Current?? && appointment.Status.Current.StatusCode?? && appointment.Status.Current.StatusCode == AppointmentStatusCode.APPOINTMENT_0150_ALLOCATION_ERROR>
{ {

8
RPtoRFX_PrepOrder.ftl
View File

@@ -37,15 +37,15 @@
"requested_delivery_start_datetime": "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}", "requested_delivery_start_datetime": "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}",
</#if> </#if>
"requested_delivery_date_type": "${requested_delivery_date_type}", "requested_delivery_date_type": "${requested_delivery_date_type}",
"consolidated_delivery": "${consolidated_delivery_flag}", "consolidated_delivery": "false",
"pick_sequence_code": "${pick_sequence_code}", "pick_sequence_code": "${pick_sequence_code}",
"intermediate_consignee": "false", "intermediate_consignee": "false",
"protected": "${protected_flag}", "protected": "false",
"automatic_generation": "${automatic_generation_flag}", "automatic_generation": "true",
"deactivate": "false", "deactivate": "false",
"optional_attributes": { "optional_attributes": {
<#include "RPtoRFX_PrepOrder_OptionalAttributes.ftl"> <#include "RPtoRFX_PrepOrder_OptionalAttributes.ftl">
"apt_with_end_consignee": "${apt_with_end_consignee_flag}", "apt_with_end_consignee": "false",
"apt_with_intermediate": "false", "apt_with_intermediate": "false",
"load_grouping": "${load_grouping}" "load_grouping": "${load_grouping}"
} }

4
RPtoRFX_PrepOrder_DefaultHeaderData.ftl
View File

@@ -18,11 +18,7 @@
<#assign originator_code = ""/> <#assign originator_code = ""/>
<#assign preparation_type_code = ""/> <#assign preparation_type_code = ""/>
<#assign requested_delivery_date_type = ""/> <#assign requested_delivery_date_type = ""/>
<#assign consolidated_delivery_flag ="false"/>
<#assign pick_sequence_code = ""/> <#assign pick_sequence_code = ""/>
<#assign protected_flag ="false"/>
<#assign automatic_generation_flag ="false"/>
<#assign apt_with_end_consignee_flag="false"/>
<#-- A supprimer si utilisation de la table de correspondance--> <#-- A supprimer si utilisation de la table de correspondance-->
<#--To be deleted if using the correspondence table--> <#--To be deleted if using the correspondence table-->

2
VERSION
View File

@@ -1 +1 @@
1.2.60+6 1.2.61+1