Merge branch 'release/1.2' into 'main'

MR->main

See merge request r-d-technique/tiers/reflex-wms-connector!37
This commit is contained in:
Cedric RODIER 2024-05-13 15:43:22 +00:00
commit fdb7cf7d2c
2 changed files with 3 additions and 3 deletions

View File

@ -24,7 +24,7 @@
<#if despatched_ipg.carton_number != "000000000000000000"> <#if despatched_ipg.carton_number != "000000000000000000">
"ContainerType": "${despatched_ipg.carton_type_code}" "ContainerType": "${despatched_ipg.carton_type_code}"
<#if preparation_line.despatched_cartons_list?? > <#if preparation_line.despatched_cartons_list?? >
<#list preparation_line.despatched_cartons_list?filter(l ->l.carton_number==despatched_ipg.carton_number) as dimensionCarton> <#list preparation_line.despatched_cartons_list?filter(l -> l?? && l.carton_number==despatched_ipg.carton_number) as dimensionCarton>
, ,
"Length": { "Length": {
"Unit": "${length_unit_rfx}", "Unit": "${length_unit_rfx}",
@ -47,7 +47,7 @@
<#else> <#else>
"ContainerType": "${despatched_ipg.hd_type_code?json_string}" "ContainerType": "${despatched_ipg.hd_type_code?json_string}"
<#if preparation_line.despatched_hds_list??> <#if preparation_line.despatched_hds_list??>
<#list preparation_line.despatched_hds_list?filter(j ->j.handling_device_number==despatched_ipg.hd_number) as dimensionHU> <#list preparation_line.despatched_hds_list?filter(j -> j?? && j.handling_device_number==despatched_ipg.hd_number) as dimensionHU>
, ,
"Length": { "Length": {
"Unit": "${length_unit_rfx}", "Unit": "${length_unit_rfx}",

View File

@ -1 +1 @@
1.2.16+1 1.2.16+2