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

Merge branch 'release/1.2' into 'main'

Browse Source 
MR->main

See merge request r-d-technique/tiers/reflex-wms-connector!60
This commit is contained in:
Cedric RODIER 2024-09-16 15:10:59 +00:00
commit 16b439d07c
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
RFXtoRP_HsrPrepa.ftl
View File

@ -49,17 +49,21 @@
</#if> </#if>
<#assign refIDHmap ={}> <#assign refIDHmap ={}>
<#assign hd_numberHmap ={}>
<#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line> <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
<#list preparation_line.despatched_ipg_list as despatched_ipg> <#list preparation_line.despatched_ipg_list as despatched_ipg>
<#assign HUadded_packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) /> <#assign HUadded_packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) />
<#if despatched_ipg.consignment_unit_id!=""> <#if despatched_ipg.consignment_unit_id!="">
, <#if !hd_numberHmap[despatched_ipg.hd_number]?? >
{ <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
<#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> ,
"apiReflexPlatformID" : "${apiReflexPlatformID}", {
"datas" : <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
<#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl"> "apiReflexPlatformID" : "${apiReflexPlatformID}",
} "datas" :
<#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">
}
</#if>
</#if> </#if>
<#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number > <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number >
, ,

2
VERSION
View File

@ -1 +1 @@
1.2.25+2 1.2.26+1