Merge branch 'version-1.2.15' into 'release/1.2'
Version 1.2.15 See merge request r-d-technique/tiers/reflex-wms-connector!25
This commit is contained in:
commit
c3a23254b1
@ -74,7 +74,6 @@
|
|||||||
}
|
}
|
||||||
</#if>
|
</#if>
|
||||||
</#list>
|
</#list>
|
||||||
<#-- <#sep>,</#sep> -->
|
|
||||||
</#list>
|
</#list>
|
||||||
]
|
]
|
||||||
<#else>
|
<#else>
|
||||||
|
|||||||
@ -2,22 +2,24 @@
|
|||||||
<#include "ReflexUtils.ftl">
|
<#include "ReflexUtils.ftl">
|
||||||
[
|
[
|
||||||
<#assign dispatched_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
|
<#assign dispatched_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
|
||||||
<#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line>
|
<#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line2>
|
||||||
<#list preparation_line.despatched_ipg_list as despatched_ipg>
|
<#list preparation_line2.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg2>
|
||||||
{
|
{
|
||||||
"Header": {
|
"Header": {
|
||||||
"ProjectID": "${projectRP}"
|
"ProjectID": "${projectRP}"
|
||||||
},
|
},
|
||||||
"ID": {
|
"ID": {
|
||||||
"RefID": "${despatched_ipg.carton_number}",
|
"RefID": "${despatched_ipg2.carton_number}",
|
||||||
"RefDate": {
|
"RefDate": {
|
||||||
"DateTime": "${dispatched_datetime}",
|
"DateTime": "${dispatched_datetime}",
|
||||||
"AuthorTimeZone": "${time_zone_rfx}"
|
"AuthorTimeZone": "${time_zone_rfx}"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Payload": { }
|
"Payload": { }
|
||||||
}<#sep>,</#sep>
|
}<#sep>,</#sep>
|
||||||
</#list>
|
</#list>
|
||||||
|
<#if preparation_line2.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000")?size!=0 >
|
||||||
<#sep>,</#sep>
|
<#sep>,</#sep>
|
||||||
</#list>
|
</#if>
|
||||||
|
</#list>
|
||||||
]
|
]
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user