Merge branch 'develop-rdz' into 'develop'

modif sur les rdz

See merge request r-d-technique/tiers/reflex-wms-connector!194
This commit is contained in:
Francis REAT 2025-12-11 13:05:15 +00:00
commit 825ca2bc54
6 changed files with 25 additions and 23 deletions

View File

@ -0,0 +1,3 @@
"CarrierInformation": [
]

View File

@ -0,0 +1,5 @@
"MetaData": [
]

View File

@ -0,0 +1,5 @@
"Quantities": [
]

View File

@ -0,0 +1,6 @@
"SegmentationSelections": [
]

View File

@ -66,12 +66,9 @@
"Value": "${carrier_apt.planned_carrier?json_string}"
}
],
"SegmentationSelections":[ <#-- intégrer les SK par la suite -->
{ "SegmentationID":"Securise",
"SegmentationValueID":"yes"},
{ "SegmentationID":"Secteur",
"SegmentationValueID":"frais"}
],
<#include "RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl">,
<#include "RFXtoRP_HsrCarrierApt_CarrierInformation.ftl">,
<#include "RFXtoRP_HsrCarrierApt_MetadataAppointment.ftl">,
<#if carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0)>
"Commissions": [
<#list carrier_apt.physical_receipt_list?filter(l ->l??) as physical_receipt>
@ -83,11 +80,7 @@
"OrderID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
</#if>
"ProjectID": "${projectRP}",
"Quantities": [
{
"UnitID": "PAL", <#-- à changer -->
"Value": 1 <#-- à changer -->
}
<#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">
]
}<#sep>,</#sep>
</#list>
@ -97,12 +90,7 @@
{
"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
"ProjectID": "${projectRP}",
"Quantities": [
{
"UnitID": "PAL", <#-- à changer -->
"Value": 1 <#-- à changer -->
}
]
<#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">
}
],
"Reason": "no commission", <#-- à changer -->

View File

@ -51,12 +51,7 @@
"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
"OrderID": "${physical_receipt.physical_receipt_reference?json_string}",
"ProjectID": "${projectRP}",
"Quantities": [
{
"UnitID": "PAL", <#-- à changer -->
"Value": 1 <#-- à changer -->
}
]
<#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">
}<#sep>,</#sep>
</#list>
],