Merge branch 'develop-rdz' into 'develop'

Develop rdz

See merge request r-d-technique/tiers/reflex-wms-connector!178
This commit is contained in:
Francis REAT 2025-11-20 16:34:47 +00:00
commit 1caf5b830f
6 changed files with 18 additions and 3 deletions

View File

@ -5,6 +5,9 @@
"ProjectID": "${projectRP}" "ProjectID": "${projectRP}"
}, },
"ID": { "ID": {
<#if (!carrier_apt_status.appointment_reference?? || carrier_apt_status.appointment_reference == "")>
<#stop "appointment_reference is not valid or empty" >
</#if>
"RefID": "${carrier_apt_status.appointment_reference?trim?json_string}", "RefID": "${carrier_apt_status.appointment_reference?trim?json_string}",
"RefDate": { "RefDate": {
"DateTime": "${ref_datetime}", "DateTime": "${ref_datetime}",

View File

@ -5,6 +5,9 @@
"ProjectID": "${projectRP}" "ProjectID": "${projectRP}"
}, },
"ID": { "ID": {
<#if (!carrier_apt_status.appointment_reference?? || carrier_apt_status.appointment_reference == "")>
<#stop "appointment_reference is not valid or empty" >
</#if>
"RefID": "${carrier_apt_status.appointment_reference?trim?json_string}", "RefID": "${carrier_apt_status.appointment_reference?trim?json_string}",
"RefDate": { "RefDate": {
"DateTime": "${ref_datetime}", "DateTime": "${ref_datetime}",

View File

@ -5,6 +5,9 @@
"ProjectID": "${projectRP}" "ProjectID": "${projectRP}"
}, },
"ID": { "ID": {
<#if (!carrier_apt_status.appointment_reference?? || carrier_apt_status.appointment_reference == "")>
<#stop "appointment_reference is not valid or empty" >
</#if>
"RefID": "${carrier_apt_status.appointment_reference?trim?json_string}", "RefID": "${carrier_apt_status.appointment_reference?trim?json_string}",
"RefDate": { "RefDate": {
"DateTime": "${ref_datetime}", "DateTime": "${ref_datetime}",

View File

@ -5,7 +5,10 @@
"ProjectID": "${projectRP}" "ProjectID": "${projectRP}"
}, },
"ID": { "ID": {
"RefID": "${carrier_apt_status.appointment_reference?trim?json_string}", <#if (!carrier_apt_status.appointment_reference?? || carrier_apt_status.appointment_reference == "")>
<#stop "appointment_reference is not valid or empty" >
</#if>
"RefID": "${carrier_apt_status.appointment_reference?trim?json_string}",
"RefDate": { "RefDate": {
"DateTime": "${ref_datetime}", "DateTime": "${ref_datetime}",
"AuthorTimeZone": "${time_zone_rfx}" "AuthorTimeZone": "${time_zone_rfx}"

View File

@ -5,6 +5,9 @@
"ProjectID": "${projectRP}" "ProjectID": "${projectRP}"
}, },
"ID": { "ID": {
<#if (!carrier_apt_status.appointment_reference?? || carrier_apt_status.appointment_reference == "")>
<#stop "appointment_reference is not valid or empty" >
</#if>
"RefID": "${carrier_apt_status.appointment_reference?trim?json_string}", "RefID": "${carrier_apt_status.appointment_reference?trim?json_string}",
"RefDate": { "RefDate": {
"DateTime": "${ref_datetime}", "DateTime": "${ref_datetime}",

View File

@ -15,7 +15,7 @@
"unloading_appointment" : "false", "unloading_appointment" : "false",
"load_appointment" : "true", "load_appointment" : "true",
"planned_load_start_datetime : "${DateTimeUTCtoRfxLocale(appointment.Slot.StartDateTime,time_zone_rfx)}", "planned_load_start_datetime : "${DateTimeUTCtoRfxLocale(appointment.Slot.StartDateTime,time_zone_rfx)}",
"planned_load_end_datetime": "${AddSecondsToDatetime(appointment.Slot.StartDateTime,appointment.Slot.DurationInSeconds?long)?iso_nz(time_zone_rfx)}" "planned_load_end_datetime": "${AddSecondsToDatetime(appointment.Slot.StartDateTime?datetime.iso,appointment.Slot.DurationInSeconds?long)?iso_nz(time_zone_rfx)}"
<#break> <#break>
@ -23,7 +23,7 @@
"unloading_appointment" : "true", "unloading_appointment" : "true",
"load_appointment" : "false", "load_appointment" : "false",
"planned_unloading_start_datetime : "${DateTimeUTCtoRfxLocale(appointment.Slot.StartDateTime?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,appointment.Slot.DurationInSeconds?long)?iso_nz(time_zone_rfx)}" "planned_unloading_end_datetime": "${AddSecondsToDatetime(appointment.Slot.StartDateTime?datetime.iso,appointment.Slot.DurationInSeconds?long)?iso_nz(time_zone_rfx)}"
<#break> <#break>
<#default> <#default>
<#stop "appointment.AppointmentType not implemented" > <#stop "appointment.AppointmentType not implemented" >