modif
This commit is contained in:
parent
0e0397708f
commit
71a73bded4
@ -6,6 +6,7 @@
|
|||||||
<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
|
<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
|
||||||
<#assign projectRP = project>
|
<#assign projectRP = project>
|
||||||
<#assign organisationRP = organisation>
|
<#assign organisationRP = organisation>
|
||||||
|
<#include "RFX_PartnerAPP_Settings.ftl">
|
||||||
|
|
||||||
<#assign aDateTime = .now>
|
<#assign aDateTime = .now>
|
||||||
|
|
||||||
@ -54,7 +55,7 @@
|
|||||||
<#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 !hd_numberHmap[despatched_ipg.hd_number]?? >
|
<#if !hd_numberHmap[despatched_ipg.hd_number]?? && (supplyOfTheTrackingNumber!=0 || (despatched_ipg.consignment_unit_id!="" && supplyOfTheTrackingNumber==1))>
|
||||||
<#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
|
<#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
|
||||||
,
|
,
|
||||||
{
|
{
|
||||||
|
|||||||
@ -10,14 +10,9 @@
|
|||||||
},
|
},
|
||||||
"ID": {
|
"ID": {
|
||||||
<#switch supplyOfTheTrackingNumber>
|
<#switch supplyOfTheTrackingNumber>
|
||||||
<#case 0>
|
|
||||||
"RefID":" ",
|
|
||||||
<#break>
|
|
||||||
<#case 1>
|
<#case 1>
|
||||||
<#if despatched_ipg.consignment_unit_id!="">
|
<#if despatched_ipg.consignment_unit_id!="">
|
||||||
"RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}",
|
"RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}",
|
||||||
<#else>
|
|
||||||
"RefID":" ",
|
|
||||||
</#if>
|
</#if>
|
||||||
<#break>
|
<#break>
|
||||||
<#case 2>
|
<#case 2>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user