Merge branch 'develop-rdz' into 'develop'
modif sur les rdz See merge request r-d-technique/tiers/reflex-wms-connector!179
This commit is contained in:
commit
899b0fd4c2
@ -232,7 +232,7 @@
|
||||
<#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "SUCCESS" >
|
||||
[
|
||||
{
|
||||
<# stop "Création rdz OK" >
|
||||
<#stop "Création rdz OK" >
|
||||
|
||||
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted>
|
||||
"apiReflexPlatformID" : "${apiReflexPlatformID}",
|
||||
@ -281,6 +281,82 @@
|
||||
]
|
||||
</#switch>
|
||||
<#break>
|
||||
<#case "appointment_put">
|
||||
<#switch restResponsetMsg.status!no_status>
|
||||
<#case no_status>
|
||||
[
|
||||
{
|
||||
<#if restResponsetMsg.body?? >
|
||||
<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
|
||||
<#else>
|
||||
<#assign restResponseBody = "${restResponsetMsg?trim?json_string}" />
|
||||
</#if>
|
||||
<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
|
||||
"apiReflexPlatformID" : "${apiReflexPlatformID}",
|
||||
"datas" :
|
||||
<#include "RFXtoRP_PlatformLogCreate.ftl">
|
||||
},
|
||||
{
|
||||
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
|
||||
"apiReflexPlatformID" : "${apiReflexPlatformID}",
|
||||
"datas" :
|
||||
<#include "RFXtoRP_RestResponseAllocationError.ftl">
|
||||
}
|
||||
]
|
||||
<#break>
|
||||
|
||||
<#case 200>
|
||||
<#case 201>
|
||||
<#-- *********************************************** ApiRestID = receipts_post ******************** -->
|
||||
<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
|
||||
<#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)>
|
||||
<#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "SUCCESS" >
|
||||
[
|
||||
{
|
||||
<#stop "Mise à jour rdz OK" >
|
||||
]
|
||||
<#else>
|
||||
[
|
||||
{
|
||||
<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
|
||||
<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
|
||||
"apiReflexPlatformID" : "${apiReflexPlatformID}",
|
||||
"datas" :
|
||||
<#include "RFXtoRP_PlatformLogCreate.ftl">
|
||||
},
|
||||
{
|
||||
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
|
||||
"apiReflexPlatformID" : "${apiReflexPlatformID}",
|
||||
"datas" :
|
||||
<#include "RFXtoRP_RestResponseAllocationError.ftl">
|
||||
}
|
||||
]
|
||||
|
||||
</#if>
|
||||
<#break>
|
||||
<#default>
|
||||
[
|
||||
{
|
||||
<#if restResponsetMsg.body?? >
|
||||
<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
|
||||
<#else>
|
||||
<#assign restResponseBody = "${restResponsetMsg?trim?json_string}" />
|
||||
</#if>
|
||||
<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
|
||||
"apiReflexPlatformID" : "${apiReflexPlatformID}",
|
||||
"datas" :
|
||||
<#include "RFXtoRP_PlatformLogCreate.ftl">
|
||||
},
|
||||
{
|
||||
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
|
||||
"apiReflexPlatformID" : "${apiReflexPlatformID}",
|
||||
"datas" :
|
||||
<#include "RFXtoRP_RestResponseAllocationError.ftl">
|
||||
}
|
||||
]
|
||||
</#switch>
|
||||
<#break>
|
||||
|
||||
|
||||
<#default>
|
||||
<#stop>
|
||||
|
||||
@ -20,21 +20,19 @@
|
||||
<#assign apiRestReflexID = ApiRestReflexID.appointment_post>
|
||||
"apiRestReflexID" : "${apiRestReflexID}",
|
||||
"datas" :
|
||||
<#include "RPtoRFX_CarrierAppointment.ftl">
|
||||
<#include "RPtoRFX_CarrierAppointmentCreated.ftl">
|
||||
},
|
||||
{
|
||||
|
||||
<#assign apiRestReflexID = ApiRestReflexID.appointment_put>
|
||||
"apiRestReflexID" : "${apiRestReflexID}",
|
||||
"datas" :
|
||||
<#include "RPtoRFX_CarrierAppointmentUpdated.ftl">
|
||||
}
|
||||
]
|
||||
<#break>
|
||||
<#default>
|
||||
<#stop >
|
||||
</#switch>
|
||||
<#switch eventRP.event>
|
||||
<#case "Created">
|
||||
<#assign appointment = eventRP.data />
|
||||
|
||||
<#stop "Appointment creation event">
|
||||
|
||||
<#break>
|
||||
<#default>
|
||||
<#stop >
|
||||
</#switch>
|
||||
|
||||
|
||||
@ -14,22 +14,22 @@
|
||||
|
||||
"unloading_appointment" : "false",
|
||||
"load_appointment" : "true",
|
||||
"planned_load_start_datetime : "${DateTimeUTCtoRfxLocale(appointment.Slot.StartDateTime,time_zone_rfx)}",
|
||||
"planned_load_end_datetime": "${AddSecondsToDatetime(appointment.Slot.StartDateTime?datetime.iso,appointment.Slot.DurationInSeconds?long)?iso_nz(time_zone_rfx)}"
|
||||
"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(appointment.Slot.StartDateTime,time_zone_rfx)}",
|
||||
"planned_load_end_datetime": "${AddSecondsToDatetime(appointment.Slot.StartDateTime?datetime.iso,appointment.Slot.DurationInSeconds?number)?iso_nz(time_zone_rfx)}",
|
||||
|
||||
<#break>
|
||||
|
||||
<#case "APPOINTMENT_TYPE_RECEPTION">
|
||||
"unloading_appointment" : "true",
|
||||
"load_appointment" : "false",
|
||||
"planned_unloading_start_datetime : "${DateTimeUTCtoRfxLocale(appointment.Slot.StartDateTime?iso_nz(time_zone_rfx))}",
|
||||
"planned_unloading_end_datetime": "${AddSecondsToDatetime(appointment.Slot.StartDateTime?datetime.iso,appointment.Slot.DurationInSeconds?long)?iso_nz(time_zone_rfx)}"
|
||||
"planned_unloading_start_datetime" : "${DateTimeUTCtoRfxLocale(appointment.Slot.StartDateTime?iso_nz(time_zone_rfx))}",
|
||||
"planned_unloading_end_datetime": "${AddSecondsToDatetime(appointment.Slot.StartDateTime?datetime.iso,appointment.Slot.DurationInSeconds?number)?iso_nz(time_zone_rfx)}",
|
||||
<#break>
|
||||
<#default>
|
||||
<#stop "appointment.AppointmentType not implemented" >
|
||||
</#switch>
|
||||
|
||||
"planned_carrier" : "${appointment.CarrierName?json_string}",
|
||||
"planned_carrier" : "ABAN", <#-- "${appointment.CarrierName?json_string}", -->
|
||||
|
||||
<#if appointment.Commissions??>
|
||||
"physical_receipt_list": [
|
||||
71
RPtoRFX_CarrierAppointmentUpdated.ftl
Normal file
71
RPtoRFX_CarrierAppointmentUpdated.ftl
Normal file
@ -0,0 +1,71 @@
|
||||
{
|
||||
"id" : {"refid" : "${eventRP.refid?json_string}"},
|
||||
"route" : "rest/public/v1/physical_depots/{physical_depot_code}/carrier_appointments/{appointment_reference}",
|
||||
"method" : "PUT",
|
||||
"uri_substitutions": {
|
||||
"physical_depot_code": "${RPtoRFXprefixDepot(eventRP.actor)}",
|
||||
"appointment_reference":"${eventRP.refid?json_string}"
|
||||
},
|
||||
"payload" :
|
||||
{
|
||||
<#switch appointment.AppointmentType>
|
||||
<#case "APPOINTMENT_TYPE_EXPEDITION">
|
||||
|
||||
"unloading_appointment" : "false",
|
||||
"load_appointment" : "true",
|
||||
"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(appointment.Slot.StartDateTime,time_zone_rfx)}",
|
||||
"planned_load_end_datetime": "${AddSecondsToDatetime(appointment.Slot.StartDateTime?datetime.iso,appointment.Slot.DurationInSeconds?number)?iso_nz(time_zone_rfx)}",
|
||||
|
||||
<#break>
|
||||
|
||||
<#case "APPOINTMENT_TYPE_RECEPTION">
|
||||
"unloading_appointment" : "true",
|
||||
"load_appointment" : "false",
|
||||
"planned_unloading_start_datetime" : "${DateTimeUTCtoRfxLocale(appointment.Slot.StartDateTime?iso_nz(time_zone_rfx))}",
|
||||
"planned_unloading_end_datetime": "${AddSecondsToDatetime(appointment.Slot.StartDateTime?datetime.iso,appointment.Slot.DurationInSeconds?number)?iso_nz(time_zone_rfx)}",
|
||||
<#break>
|
||||
<#default>
|
||||
<#stop "appointment.AppointmentType not implemented" >
|
||||
</#switch>
|
||||
|
||||
"planned_carrier" : "ABAN", <#-- "${appointment.CarrierName?json_string}", -->
|
||||
|
||||
<#if appointment.Commissions??>
|
||||
"physical_receipt_list": [
|
||||
<#list appointment.Commissions as commission>
|
||||
<#-- {
|
||||
"receipt_activity": "str",
|
||||
"originator_code": "string",
|
||||
"physical_receipt_reference": "string",
|
||||
"receipt_year": 0,
|
||||
"receipt_number": 0,
|
||||
"comment_list": [
|
||||
{
|
||||
"line_number": 999,
|
||||
"group_code": "str",
|
||||
"text": "string"
|
||||
}
|
||||
]
|
||||
|
||||
{
|
||||
"ProjectID": "recette-rfxdev",
|
||||
"OrderID": "SPA-121125-02",
|
||||
"Quantities": [
|
||||
{
|
||||
"UnitID": "PAL",
|
||||
"Value": 1.0
|
||||
}
|
||||
],
|
||||
"OrganisationID": "recette",
|
||||
"PartnerAppID": "recette-rfxdev-rfxdev",
|
||||
"ExecutionflowID": "DPFALIDEPT ALIMSPA-121125-02"
|
||||
}
|
||||
}
|
||||
|
||||
<#sep>,</#sep>
|
||||
-->
|
||||
</#list>
|
||||
]
|
||||
</#if>
|
||||
}
|
||||
}
|
||||
@ -14,7 +14,7 @@
|
||||
<#-- -------------------------------------------------------------------------------------------- -->
|
||||
<#function AddSecondsToDatetime date seconds>
|
||||
<#assign timeInMilliseconds = (1000 * seconds) >
|
||||
<#assign aDate = date?long + timeInMilliseconds?long>
|
||||
<#assign aDate = date?long + timeInMilliseconds>
|
||||
<#return aDate?number_to_datetime>
|
||||
</#function>
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user