reflex/reflex-wms-connector
0
Fork 0
Code Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into Release-2.0-V14

Browse Source
This commit is contained in:
francis reat
2026-06-29 17:02:01 +02:00
parent 2358ba0a9d 3cfc888bae
commit 9725e8165a
5 changed files with 84 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
RFXtoRP_HsaDispute_Created.ftl
View File

@@ -7,6 +7,7 @@
"ProjectID": "${projectRP}"
},
"ID": {
<#-- for Claim on preparation -->
<#if dispute.dispute_preparation??>
<#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0>
"RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_activity_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
@@ -14,8 +15,14 @@
<#stop "preparation order list is empty" >
</#if>
<#else>
<#-- for Claim on reception -->
<#if dispute.dispute_reception??>
"RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
<#else>
<#-- for Claim on anticipated receipt -->
<#if dispute.dispute_anticipated_receipt??>
"RefID": "${dispute.dispute_anticipated_receipt.anticipated_receipt_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_activity_code?replace(" ","")?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
</#if>
</#if>
</#if>
},
@@ -43,7 +50,8 @@
<#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl">,
<#-- To configure -->
<#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl">
<#if dispute.dispute_type_code=="050" > <#-- Preparation -->
<#-- for Claim on preparation -->
<#if dispute.dispute_type_code=="050" >
<#if dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?? && dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference!="">
"EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
"DisplayID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
@@ -52,6 +60,7 @@
"DisplayID":"O${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_year_number?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_number?trim?json_string}",
</#if>
<#else>
<#-- for Claim on receipt -->
<#if dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070" >
<#if dispute.dispute_reception.reception_type_code=="030"> <#-- Receipt transfer type -->
<#if dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?? && dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot!="" >
@@ -74,11 +83,26 @@
<#stop "WMS type code not supported">
</#if>
</#if>
<#-- for Claim on anticipated receipt -->
<#else>
<#if dispute.dispute_type_code=="020" >
<#if dispute.dispute_anticipated_receipt.anticipated_receipt_reference?? && dispute.dispute_anticipated_receipt.anticipated_receipt_reference!="">
"EntityID":"${dispute.dispute_anticipated_receipt.anticipated_receipt_reference?json_string}",
"DisplayID":"${dispute.dispute_anticipated_receipt.anticipated_receipt_reference?json_string}",
<#else>
"EntityID":"AR-${dispute.dispute_anticipated_receipt.anticipated_receipt_physical_depot_code?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_activity_code?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_contractor_code?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_year_number?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_number?json_string}",
"DisplayID":"AR-${dispute.dispute_anticipated_receipt.anticipated_receipt_physical_depot_code?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_activity_code?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_contractor_code?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_year_number?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_number?json_string}",
</#if>
</#if>
</#if>
</#if>
<#if TableReasonCode[dispute.dispute_reason_code]??>
<#if dispute.dispute_type_code=="020" >
"ClaimTypeID":"CLAIMTYPE_${projectRP}_ORDER_${TableReasonCode[dispute.dispute_reason_code]}"
<#else>
"ClaimTypeID":"CLAIMTYPE_${projectRP}_EXECUTIONFLOW_${TableReasonCode[dispute.dispute_reason_code]}"
</#if>
<#else>
<#stop "Claim reason code not supported" >
</#if>

40
RFXtoRP_HsaDispute_MessageSent.ftl
View File

@@ -6,6 +6,8 @@
"ProjectID": "${projectRP}"
},
"ID": {
<#-- for Claim on preparation -->
<#-- for Claim on preparation -->
<#if dispute.dispute_preparation??>
<#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0>
"RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_activity_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
@@ -13,8 +15,14 @@
<#stop "preparation order list is empty" >
</#if>
<#else>
<#-- for Claim on reception -->
<#if dispute.dispute_reception??>
"RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
<#else>
<#-- for Claim on anticipated receipt -->
<#if dispute.dispute_anticipated_receipt??>
"RefID": "${dispute.dispute_anticipated_receipt.anticipated_receipt_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_activity_code?replace(" ","")?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
</#if>
</#if>
</#if>
},
@@ -25,6 +33,10 @@
<#else>
<#if dispute.dispute_reception??>
"Message": "${dispute.dispute_reception.reception_reference?trim?json_string}"
<#else>
<#if dispute.dispute_anticipated_receipt??>
"Message": "${dispute.dispute_anticipated_receipt.anticipated_receipt_reference?trim?json_string}"
</#if>
</#if>
</#if>
@@ -36,6 +48,7 @@
"ProjectID": "${projectRP}"
},
"ID": {
<#-- for Claim on preparation -->
<#if dispute.dispute_preparation??>
<#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0>
"RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_activity_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
@@ -43,8 +56,14 @@
<#stop "preparation order list is empty" >
</#if>
<#else>
<#-- for Claim on reception -->
<#if dispute.dispute_reception??>
"RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
<#else>
<#-- for Claim on anticipated receipt -->
<#if dispute.dispute_anticipated_receipt??>
"RefID": "${dispute.dispute_anticipated_receipt.anticipated_receipt_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_activity_code?replace(" ","")?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
</#if>
</#if>
</#if>
},
@@ -58,6 +77,7 @@
"ProjectID": "${projectRP}"
},
"ID": {
<#-- for Claim on preparation -->
<#if dispute.dispute_preparation??>
<#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0>
"RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_activity_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
@@ -65,8 +85,14 @@
<#stop "preparation order list is empty" >
</#if>
<#else>
<#-- for Claim on reception -->
<#if dispute.dispute_reception??>
"RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
<#else>
<#-- for Claim on anticipated receipt -->
<#if dispute.dispute_anticipated_receipt??>
"RefID": "${dispute.dispute_anticipated_receipt.anticipated_receipt_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_activity_code?replace(" ","")?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
</#if>
</#if>
</#if>
},
@@ -80,6 +106,7 @@
"ProjectID": "${projectRP}"
},
"ID": {
<#-- for Claim on preparation -->
<#if dispute.dispute_preparation??>
<#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0>
"RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_activity_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
@@ -87,8 +114,14 @@
<#stop "preparation order list is empty" >
</#if>
<#else>
<#-- for Claim on reception -->
<#if dispute.dispute_reception??>
"RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
<#else>
<#-- for Claim on anticipated receipt -->
<#if dispute.dispute_anticipated_receipt??>
"RefID": "${dispute.dispute_anticipated_receipt.anticipated_receipt_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_activity_code?replace(" ","")?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
</#if>
</#if>
</#if>
},
@@ -102,6 +135,7 @@
"ProjectID": "${projectRP}"
},
"ID": {
<#-- for Claim on preparation -->
<#if dispute.dispute_preparation??>
<#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0>
"RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_activity_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
@@ -109,8 +143,14 @@
<#stop "preparation order list is empty" >
</#if>
<#else>
<#-- for Claim on reception -->
<#if dispute.dispute_reception??>
"RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
<#else>
<#-- for Claim on anticipated receipt -->
<#if dispute.dispute_anticipated_receipt??>
"RefID": "${dispute.dispute_anticipated_receipt.anticipated_receipt_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_activity_code?replace(" ","")?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
</#if>
</#if>
</#if>
},

1
RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl
View File

@@ -134,6 +134,7 @@
<#list (carrier_apt.anticipated_receipt_list![])?filter(l -> l??) as anticipated_receipt>
<#if AddComma == true>
,
<#assign AddComma = false />
</#if>
{
"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",

1
RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
View File

@@ -116,6 +116,7 @@
<#list (carrier_apt.anticipated_receipt_list![])?filter(l -> l??) as anticipated_receipt>
<#if AddComma == true>
,
<#assign AddComma = false />
</#if>
{
"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",

4
RPtoRFX_AppointmentEvent.ftl
View File

@@ -27,6 +27,10 @@
<#case "Updated">
<#assign AddComma = false />
<#assign appointment = eventRP.data />
<#if !eventRP.commissionsUpdated!false && !eventRP.reasonUpdated!false && !eventRP.slotUpdated!false && !eventRP.carrierInformationUpdated!false>
<#stop>
</#if>
[
<#if appointment?? && (!(appointment.WMSCreated??) || !appointment.WMSCreated) && appointment.Status?? && appointment.Status.Current?? && appointment.Status.Current.StatusCode?? && appointment.Status.Current.StatusCode == AppointmentStatusCode.APPOINTMENT_0150_ALLOCATION_ERROR>
{