Merge branch 'SCPN1-6564' into 'release/1.2'

SCPN1-6564

See merge request r-d-technique/tiers/reflex-wms-connector!38

(cherry picked from commit c0dd029d1ff89d69ea644f402f03177c16b78251)
This commit is contained in:
Francis REAT 2024-05-16 15:30:52 +00:00 committed by frea
parent b3da874dd3
commit c31d6de4a2
2 changed files with 6 additions and 5 deletions

View File

@ -2,8 +2,11 @@
<#include "ReflexUtils.ftl"> <#include "ReflexUtils.ftl">
[ [
<#assign dispatched3_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) /> <#assign dispatched3_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
<#assign generatedComa = false>
<#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line3> <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line3>
<#list preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg3> <#list preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg3>
<#if generatedComa >,</#if>
{ {
"Header": { "Header": {
"ProjectID": "${projectRP}" "ProjectID": "${projectRP}"
@ -16,10 +19,8 @@
} }
}, },
"Payload": { } "Payload": { }
}<#sep>,</#sep> }
<#assign generatedComa = true>
</#list> </#list>
<#if preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000")?size!=0 >
<#sep>,</#sep>
</#if>
</#list> </#list>
] ]

View File

@ -16,7 +16,7 @@
"Payload": { "Payload": {
"IncludedHandlingunitIDs": [ "${despatched_ipg.carton_number}" ] "IncludedHandlingunitIDs": [ "${despatched_ipg.carton_number}" ]
<#if preparation_line.despatched_hds_list?? > <#if preparation_line.despatched_hds_list?? && preparation_line.despatched_hds_list[0]??>
, ,
"Information": { "Information": {
"ContainerType": "${preparation_line.despatched_hds_list[0].hd_type_code}", "ContainerType": "${preparation_line.despatched_hds_list[0].hd_type_code}",