modifs labelled

This commit is contained in:
Laurie MONTANT 2024-09-30 15:28:24 +02:00
parent 9f02fce236
commit e97066c118
2 changed files with 19 additions and 12 deletions

View File

@ -53,17 +53,15 @@
<#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 !hd_numberHmap[despatched_ipg.hd_number]?? >
<#if !hd_numberHmap[despatched_ipg.hd_number]?? > <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
<#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}> ,
, {
{ <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
<#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> "apiReflexPlatformID" : "${apiReflexPlatformID}",
"apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" :
"datas" : <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">
<#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 >
, ,

View File

@ -8,7 +8,16 @@
"ProjectID": "${projectRP}" "ProjectID": "${projectRP}"
}, },
"ID": { "ID": {
"RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}" <#if despatched_ipg.consignment_unit_id!="">
"RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}"
<#else>
<#if despatched_ipg.carton_number != "000000000000000000">
"RefID":"${despatched_ipg.carton_number}"
<#else>
"RefID":"${despatched_ipg.hd_number}"
</#if>
</#if>
"RefDate": { "RefDate": {
"DateTime": "${dispatched_datetime4}", "DateTime": "${dispatched_datetime4}",
"AuthorTimeZone": "${time_zone_rfx}" "AuthorTimeZone": "${time_zone_rfx}"