Compare commits

...

25 Commits

Author SHA1 Message Date
14f4eff9ff Release 1.2.63+1 2026-07-07 16:08:23 +02:00
d8c1be1a94 Merge branch 'Release-1.2-V14' into 'release/1.2'
Release-1.2-V14 into release/1.2

See merge request r-d-technique/tiers/reflex-wms-connector!294
2026-07-07 12:20:33 +00:00
b5200d1843 SCPN1-10996 2026-07-07 14:13:43 +02:00
e8028e20f1 update RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl par defaut
(cherry picked from commit 5ba3540254930652e9ba2776ff26cec258d8fb70)
2026-07-02 16:31:01 +02:00
8183beae61 Release 1.2.62+1 2026-07-02 12:15:10 +02:00
30807bc840 Merge branch 'Release-1.2-V14' into 'release/1.2'
Release-1.2-V14 into release/1.2

See merge request r-d-technique/tiers/reflex-wms-connector!289
2026-07-02 08:42:02 +00:00
6aafd2f6e9 SCPN1-10966
(cherry picked from commit 3c3f197baea8ae36d7cf2f33d94c5494ca23a417)
2026-07-02 09:49:42 +02:00
8011a7f2ea Release 1.2.61+1 2026-06-30 10:47:19 +02:00
f829a02d98 Merge branch 'Release-1.2-V14' into 'release/1.2'
Release 1.2 V 14

See merge request r-d-technique/tiers/reflex-wms-connector!284
2026-06-29 15:07:26 +00:00
11c928e257 Merge branch 'develop-1.2' into Release-1.2-V14 2026-06-29 17:02:39 +02:00
7c9321002f Merge branch 'develop-1.2' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into develop-1.2 2026-06-29 15:56:58 +02:00
d4e5910933 CMD 2026-06-29 15:56:52 +02:00
65fca99577 SCPN1-10882
(cherry picked from commit d380ec91f8)
2026-06-25 13:56:51 +02:00
89be22e1e1 Merge branch 'develop-1.2' into Release-1.2-V14
# Conflicts:
#	ActorPrefix.ftl
#	RFXtoRP_HsaDesPatch.ftl
#	RFXtoRP_HsaDespNt.ftl
#	RFXtoRP_HsrLoadInfo.ftl
#	RFXtoRP_HsrPackBranch.ftl
#	RFXtoRP_HsrPackOrder.ftl
2026-06-22 13:38:41 +02:00
a4b5a1dbf0 SCPN1-10671 2026-05-12 18:00:59 +02:00
e3f829683f SCPN1-10706 2026-05-12 11:32:55 +02:00
2512bdda84 SCPN1-10765 2026-05-12 10:27:46 +02:00
9618f5bffb SCPN1-10706 2026-05-12 10:14:53 +02:00
7563a1e932 SCPN1-10765 2026-05-11 17:26:42 +02:00
e73a2ccd83 SCPN1-10736 2026-05-05 14:11:06 +02:00
e75658e7ac SCPN1-10736 2026-05-05 10:56:55 +02:00
e1981b8fbd SCPN1-10671 2026-04-30 15:29:45 +02:00
285d5ff330 Merge branch 'develop-1.2' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into develop-1.2 2026-04-28 09:48:32 +02:00
51fdb6d382 SCPN1-10682 2026-04-28 09:48:27 +02:00
d96c2c73c1 SCPN1-10671
(cherry picked from commit 9916545817)
2026-04-27 10:47:28 +02:00
13 changed files with 31 additions and 24 deletions

View File

@@ -12,6 +12,7 @@
"RefID": "${reflexMvtStockInterface.hd_number?trim?json_string}" "RefID": "${reflexMvtStockInterface.hd_number?trim?json_string}"
}, },
"Payload": { "Payload": {
"Reference":"${reflexMvtStockInterface.hd_number?trim?json_string}",
"ReceivedContents" :[ "ReceivedContents" :[
{ {
"DateTime": { "DateTime": {

View File

@@ -1,6 +1,6 @@
"SegmentationSelections": [ "SegmentationKeys": [
] ]

View File

@@ -22,6 +22,11 @@
}, },
"Payload": { "Payload": {
<#if despatched_ipg.carton_number != "000000000000000000">
"Reference": "${despatched_ipg.carton_number}",
<#else>
"Reference": "${despatched_ipg.hd_number}",
</#if>
"Information" :{ "Information" :{
<#if despatched_ipg.carton_number != "000000000000000000"> <#if despatched_ipg.carton_number != "000000000000000000">
"ContainerType": "${despatched_ipg.carton_type_code?json_string}" "ContainerType": "${despatched_ipg.carton_type_code?json_string}"

View File

@@ -27,6 +27,11 @@
<#case "Updated"> <#case "Updated">
<#assign AddComma = false /> <#assign AddComma = false />
<#assign appointment = eventRP.data /> <#assign appointment = eventRP.data />
<#-- processing is stopped because the Updated event contains no relevant change to forward to the WMS. -->
<#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>
{ {

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

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

View File

@@ -1 +1 @@
1.2.60+6 1.2.63+1