Correction HsrPrepa_Carrier

This commit is contained in:
Laurie MONTANT 2025-07-04 15:05:14 +02:00
parent 83a1f59edf
commit 58118c394b
2 changed files with 33 additions and 31 deletions

View File

@ -9,29 +9,30 @@
<#else> <#else>
<#assign OrderOriginReference = "O${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}"> <#assign OrderOriginReference = "O${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}">
</#if> </#if>
<#if !refIDHmap_local[OrderOriginReference]?? >
<#if refIDHmap_local?size != 0 > <#if refIDHmap_local?size != 0 >
, ,
</#if> </#if>
<#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}> <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}>
{ {
"Header": { "Header": {
"ProjectID": "${projectRP}" "ProjectID": "${projectRP}"
}, },
"ID":{ "ID":{
"RefID": "${OrderOriginReference}" "RefID": "${OrderOriginReference}"
}, },
"Payload":{ "Payload":{
"Carrier": { "Carrier": {
"ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}" "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
}
<#-- Add transport grade code
<#if preparationOrder.transport_grade_code!="">
,
"CarrierService":"${preparationOrder.transport_grade_code?trim?json_string}"
</#if> -->
} }
<#-- Add transport grade code }
<#if preparationOrder.transport_grade_code!=""> </#if>
,
"CarrierService":"${preparationOrder.transport_grade_code?trim?json_string}"
</#if> -->
}
}
</#list> </#list>
<#assign refIDHmap_local ={}> <#assign refIDHmap_local ={}>
] ]

View File

@ -9,24 +9,25 @@
<#else> <#else>
<#assign OrderOriginReference = "O${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}"> <#assign OrderOriginReference = "O${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}">
</#if> </#if>
<#if !refIDHmap_local[OrderOriginReference]?? >
<#if refIDHmap_local?size != 0 > <#if refIDHmap_local?size != 0 >
, ,
</#if> </#if>
<#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}> <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}>
{ {
"Header": { "Header": {
"ProjectID": "${projectRP}" "ProjectID": "${projectRP}"
}, },
"ID":{ "ID":{
"RefID": "${OrderOriginReference}" "RefID": "${OrderOriginReference}"
}, },
"Payload":{ "Payload":{
"Carrier": { "Carrier": {
"ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}" "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
}
} }
} }
} </#if>
</#list> </#list>
<#assign refIDHmap_local ={}> <#assign refIDHmap_local ={}>
] ]