Compare commits

...

21 Commits

Author SHA1 Message Date
cyril.scandaliato
3b66a99db3 Release 2.0.25+6 2026-09-17 14:43:36 +02:00
b74d459abe Merge branch 'release-2.0--SCPN1-11254' into 'release/2.0'
Resolve SCPN1-11254 "Release 2.0  "

See merge request r-d-technique/tiers/reflex-wms-connector!315
2026-09-17 11:57:05 +00:00
89c00a2466 SCPN1-11254 2026-09-16 15:53:50 +02:00
bb5b2c8c64 SCPN1-11254 2026-09-16 15:46:03 +02:00
ea4df33d7a Release 2.0.25+5 2026-09-04 15:35:08 +02:00
adbd5180a4 revert VERSION 2026-09-04 13:33:43 +00:00
16cec5e7e0 Release 2.0.26+1 2026-09-04 15:26:03 +02:00
9888046050 Merge branch 'release2.0-SCPN1-11197' into 'release/2.0'
SCPN1-11197

See merge request r-d-technique/tiers/reflex-wms-connector!311
2026-09-04 09:32:51 +00:00
9fb02d6172 SCPN1-11197
(cherry picked from commit edeb9db5b964cb61990b53b07d0bc8c9e9057fbe)

Co-authored-by: Laurie Montant <laurie.montant@hardis-group.com>
2026-09-03 13:46:09 +00:00
3230207b81 Release 2.0.25+4 2026-07-29 14:56:27 +02:00
d74a5e2cf9 Merge branch 'SCPN1-11090' into 'release/2.0'
SCPN1-11090

See merge request r-d-technique/tiers/reflex-wms-connector!308
2026-07-29 12:46:48 +00:00
3d6afa4f30 SCPN1-11090
(cherry picked from commit 911ed1d5cf8238a7ca8d267005ca9ac18aee551b)

Co-authored-by: Laurie Montant <laurie.montant@hardis-group.com>
2026-07-29 12:21:08 +00:00
3f8ee07798 SCPN1-11090
(cherry picked from commit 72bf165112481625c9164f153e5368da710375f2)

Co-authored-by: Laurie Montant <laurie.montant@hardis-group.com>
2026-07-29 12:20:59 +00:00
ff617683e7 SCPN1-11090
(cherry picked from commit 70fe4a3eda48a1cd6bf6be79858acb01d24c3286)

Co-authored-by: Laurie Montant <laurie.montant@hardis-group.com>
2026-07-29 12:20:51 +00:00
d12a852ae4 SCPN1-11090
(cherry picked from commit cb1b99af9644613d8cc4033e10ef971f66328417)

Co-authored-by: Laurie Montant <laurie.montant@hardis-group.com>
2026-07-29 12:20:44 +00:00
35819ec7b5 SCPN1-11090
(cherry picked from commit af2ccc088c2dd4a2ab1385ba705b7615a2297ca3)

Co-authored-by: Laurie Montant <laurie.montant@hardis-group.com>
2026-07-29 12:20:31 +00:00
baa910ab21 SCPN1-11090
(cherry picked from commit 8b8abd09daf3f10bec389d98457d2258e169c08c)

Co-authored-by: Laurie Montant <laurie.montant@hardis-group.com>
2026-07-29 12:20:17 +00:00
d358b41bf0 SCPN1-11090
(cherry picked from commit fb17a8e1172803a8de6c7c07a3b0689720f8398e)

Co-authored-by: Laurie Montant <laurie.montant@hardis-group.com>
2026-07-29 12:20:03 +00:00
22051fb31d Release 2.0.25+3 2026-07-23 10:37:52 +02:00
36207120d6 Merge branch 'release2.0-SCPN1-11065' into 'release/2.0'
SCPN1-11065

See merge request r-d-technique/tiers/reflex-wms-connector!303
2026-07-23 08:36:01 +00:00
01038d40c0 SCPN1-11065 2026-07-20 16:55:34 +02:00
7 changed files with 185 additions and 69 deletions

View File

@@ -102,6 +102,7 @@
<#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
}
<#else>
<#if receipt.line_list ?? && receipt.line_list[0]??>
{
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
"apiReflexPlatformID" : "${apiReflexPlatformID}",
@@ -114,6 +115,9 @@
"datas" :
<#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
}
<#else>
<#stop> <#-- No line -->
</#if>
</#if>
<#else>
<#if receipt.receipt_confirmed?? && receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
@@ -138,6 +142,7 @@
<#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
}
<#else>
<#if receipt.line_list ?? && receipt.line_list[0]??>
{
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
"apiReflexPlatformID" : "${apiReflexPlatformID}",
@@ -150,10 +155,14 @@
"datas" :
<#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
}
<#else>
<#stop> <#-- No line -->
</#if>
</#if>
<#else>
<#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "false" && receipt.line_list?? && receipt.line_list[0]??>
<#if receipt.receipt_reference?? && receipt.receipt_reference!="">
<#if receipt.line_list ?? && receipt.line_list[0]??>
[
{
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
@@ -168,6 +177,9 @@
<#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">
}
]
<#else>
<#stop> <#-- No line -->
</#if>
<#else>
<#stop> <#-- Receipt reference for transfer is empty-->
</#if>
@@ -186,7 +198,7 @@
<#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
}
<#else>
<#stop>
<#stop> <#-- No line -->
</#if>
</#if>
</#if>

View File

@@ -34,7 +34,7 @@
"Key": "order_number",
"Value": "${receipt.receipt_number}"
},
<#if receipt.line_list[0]?? && receipt.line_list[0].line_anticipated?? && receipt.line_list[0].line_anticipated.anticipated_receipt_year!=0 && receipt.line_list[0].line_anticipated.anticipated_receipt_number!=0 >
<#if receipt.line_list?? && receipt.line_list[0]?? && receipt.line_list[0].line_anticipated?? && receipt.line_list[0].line_anticipated.anticipated_receipt_year!=0 && receipt.line_list[0].line_anticipated.anticipated_receipt_number!=0 >
{
"Key": "anticipated",
"Value": "true"
@@ -74,7 +74,7 @@
"ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}"
},
"ShipToAcked": true,
<#if receipt.line_list[0]?? && receipt.line_list[0].line_anticipated?? && receipt.line_list[0].line_anticipated.anticipated_receipt_year!=0 && receipt.line_list[0].line_anticipated.anticipated_receipt_reference?? && receipt.line_list[0].line_anticipated.anticipated_receipt_reference=="" >
<#if receipt.line_list?? && receipt.line_list[0]?? && receipt.line_list[0].line_anticipated?? && receipt.line_list[0].line_anticipated.anticipated_receipt_year!=0 && receipt.line_list[0].line_anticipated.anticipated_receipt_reference?? && receipt.line_list[0].line_anticipated.anticipated_receipt_reference=="" >
"OrderID":"AR-${receipt.line_list[0].line_anticipated.anticipated_receipt_depot_code?trim?json_string}${receipt.line_list[0].line_anticipated.anticipated_receipt_activity_code?trim?json_string}${receipt.line_list[0].line_anticipated.anticipated_receipt_originator_code?trim?json_string}${receipt.line_list[0].line_anticipated.anticipated_receipt_year}${receipt.line_list[0].line_anticipated.anticipated_receipt_number}",
<#else>
<#if receipt.receipt_reference?? && receipt.receipt_reference!="">

View File

@@ -37,7 +37,18 @@
{
"Key": "order_number",
"Value": "${receipt.receipt_number}"
},
<#if receipt.line_list?? && receipt.line_list[0]?? && receipt.line_list[0].line_anticipated?? && receipt.line_list[0].line_anticipated.anticipated_receipt_year!=0 && receipt.line_list[0].line_anticipated.anticipated_receipt_number!=0 >
{
"Key": "anticipated",
"Value": "true"
}
<#else>
{
"Key": "anticipated",
"Value": "false"
}
</#if>
],
<#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" && receipt.receipt_reference?? && receipt.receipt_reference!="">
"RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
@@ -140,6 +151,47 @@
{
"Header": {"ProjectID": "${projectRP}"},
"ID": {
"CustomFields": [
{
"Key": "depot_code",
<#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
"Value": "${receipt.origin_order_line_depot?trim?json_string}"
<#else>
"Value": "${receipt.physical_depot_code?trim?json_string}"
</#if>
},
{
"Key": "activity_code",
"Value": "${receipt.activity_code?trim?json_string}"
},
{
"Key": "originator_code",
"Value": "${receipt.originator_code?trim?json_string}"
},
{
"Key": "reference",
"Value": "${receipt.receipt_reference?trim?json_string}"
},
{
"Key": "order_year",
"Value": "${receipt.receipt_year}"
},
{
"Key": "order_number",
"Value": "${receipt.receipt_number}"
},
<#if receipt.line_list?? && receipt.line_list[0]?? && receipt.line_list[0].line_anticipated?? && receipt.line_list[0].line_anticipated.anticipated_receipt_year!=0 && receipt.line_list[0].line_anticipated.anticipated_receipt_number!=0 >
{
"Key": "anticipated",
"Value": "true"
}
<#else>
{
"Key": "anticipated",
"Value": "false"
}
</#if>
],
<#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
"RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
<#else>
@@ -226,6 +278,47 @@
{
"Header": {"ProjectID": "${projectRP}"},
"ID": {
"CustomFields": [
{
"Key": "depot_code",
<#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
"Value": "${receipt.origin_order_line_depot?trim?json_string}"
<#else>
"Value": "${receipt.physical_depot_code?trim?json_string}"
</#if>
},
{
"Key": "activity_code",
"Value": "${receipt.activity_code?trim?json_string}"
},
{
"Key": "originator_code",
"Value": "${receipt.originator_code?trim?json_string}"
},
{
"Key": "reference",
"Value": "${receipt.receipt_reference?trim?json_string}"
},
{
"Key": "order_year",
"Value": "${receipt.receipt_year}"
},
{
"Key": "order_number",
"Value": "${receipt.receipt_number}"
},
<#if receipt.line_list?? && receipt.line_list[0]?? && receipt.line_list[0].line_anticipated?? && receipt.line_list[0].line_anticipated.anticipated_receipt_year!=0 && receipt.line_list[0].line_anticipated.anticipated_receipt_number!=0 >
{
"Key": "anticipated",
"Value": "true"
}
<#else>
{
"Key": "anticipated",
"Value": "false"
}
</#if>
],
"RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
"RefDate": {
"DateTime": "${receipt_creation_datetime}",

View File

@@ -1,7 +1,16 @@
<#include "HfRpConfig.ftl">
[
<#assign UUID = UUID.randomUUID()>
<#assign strJsonBody = JsonUtil.espaceQuoteInJsonString(restResponseBody)>
<#assign strJsonBody = JsonUtil.espaceQuoteInJsonString(restResponseBody)?replace("\n", "")?replace("\r", "")>
<#assign maxLen = 32000>
<#if strJsonBody?length gt maxLen>
<#assign strJsonBody = JsonUtil.espaceQuoteInJsonString(restResponseBody)?replace("\n", "")?replace("\r", "")?replace('"logical_key_list"\\s*:\\s*\\[[^\\]]*\\]', '"logical_key_list": []', 'r')>
</#if>
<#if strJsonBody?length gt maxLen>
<#assign safeJsonBody = "{\"truncated\": true, \"original_size\": " + strJsonBody?length + "}">
<#else>
<#assign safeJsonBody = strJsonBody>
</#if>
{
"Header": {
"ProjectID": "${projectRP}"
@@ -23,21 +32,20 @@
},
"TechMessage": {
"Code": "${restResponsetMsg.status!"no Code"}",
"Label": ${strJsonBody?truncate(32000,'...')}
"Label": "${safeJsonBody?json_string}"
},
"UserMessage": {
"Code": "${restResponsetMsg.status!"no Code"}",
"Label": ${strJsonBody?truncate(32000,'...')},
"Label": "${safeJsonBody?json_string}",
"Params": []
},
"DetailElements": [],
"CorrelationID": "${id.correlationid!"no Correlationid"}",
"ContextPayload": ${strJsonBody?truncate(32000,'...')},
"ContextPayload": "${safeJsonBody?json_string}",
"Type": "${event}",
"Task": "${id.apiRestReflexID!"no Task"}",
"OriginalID": "${id.refid!"no OriginalID"?trim?json_string}",
"StackTrace": ""
}
}
]

View File

@@ -358,7 +358,7 @@
]
</#switch>
<#break>
<#-- *********************************************** ApiRestID = canceled ******************** -->
<#-- *********************************************** ApiRestID = status ******************** -->
<#case "status_appointment_put_update_by_ref">
<#case "status_appointment_put_update_by_number">
<#switch restResponsetMsg.status!no_status>

View File

@@ -38,7 +38,11 @@
<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING >
<#if appointment.Unloading?? && appointment.Unloading.Projects?? &&
appointment.Unloading.Projects[0]?? &&
appointment.Unloading.Projects[0].Commissions??>
appointment.Unloading.Projects[0].Commissions?? >
<#if (appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID!"") == "" &&
(appointment.Unloading.Projects[0].Commissions[0].OrderID!"") == "">
"appointment_designation":"${(appointment.Reason!"")!?json_string}",
<#else>
"physical_receipt_list": [
<#list appointment.Unloading.Projects[0].Commissions?filter(l ->l.ExecutionflowID?? && l.ExecutionflowID !="") as commission>
<#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.key == commission.ExecutionflowID && l.value?? && l.value?has_content) as custom>
@@ -70,8 +74,7 @@
<#sep>,</#sep>
</#list>
],
<#else>
"appointment_designation":"${(appointment.Reason!"")!?json_string}",
</#if>
</#if>
<#else>
<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING>

View File

@@ -1 +1 @@
2.0.25+2
2.0.25+6