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

Merge branch 'develop-1.2' into Release-1.2-V14

Browse Source 
# Conflicts:
#	ActorPrefix.ftl
#	RFXtoRP_HsaDesPatch.ftl
#	RFXtoRP_HsaDespNt.ftl
#	RFXtoRP_HsrLoadInfo.ftl
#	RFXtoRP_HsrPackBranch.ftl
#	RFXtoRP_HsrPackOrder.ftl
This commit is contained in:
francis reat
2026-06-22 13:38:41 +02:00
parent 5e3633aaa1 a4b5a1dbf0
commit 89be22e1e1
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ActorPrefix.ftl
View File

@@ -38,7 +38,7 @@
<#local depot = actor> <#local depot = actor>
<#else> <#else>
<#if actor?length gt 4> <#if actor?length gt 4>
<#local depot = actor[4..]> <#local depot = actor[4..]>
<#else> <#else>
<#local depot = actor> <#local depot = actor>
</#if> </#if>
@@ -83,7 +83,7 @@
<#local supplier = actor> <#local supplier = actor>
<#else> <#else>
<#if actor?length gt 4> <#if actor?length gt 4>
<#local supplier = actor[4..]> <#local supplier = actor[4..]>
<#else> <#else>
<#local supplier = actor> <#local supplier = actor>
</#if> </#if>
@@ -126,7 +126,7 @@
<#local carrier = actor> <#local carrier = actor>
<#else> <#else>
<#if actor?length gt 4> <#if actor?length gt 4>
<#local carrier = actor[4..]> <#local carrier = actor[4..]>
<#else> <#else>
<#local carrier = actor> <#local carrier = actor>
</#if> </#if>
@@ -169,7 +169,7 @@
<#local consignee = actor> <#local consignee = actor>
<#else> <#else>
<#if actor?length gt 4> <#if actor?length gt 4>
<#local consignee = actor[4..]> <#local consignee = actor[4..]>
<#else> <#else>
<#local consignee = actor> <#local consignee = actor>
</#if> </#if>

4
RFXtoRP_HsaDesPatch.ftl
View File

@@ -17,7 +17,7 @@
<#assign desPatch = JsonUtil.jsonToMap(dataRfx)> <#assign desPatch = JsonUtil.jsonToMap(dataRfx)>
<#stop> <#stop>
<#break> <#break>
<#case "D"> <#case "D">
<#-- *********************************************** Action = DELETE ******************** --> <#-- *********************************************** Action = DELETE ******************** -->
@@ -25,7 +25,7 @@
<#assign desPatch = JsonUtil.jsonToMap(dataRfx)> <#assign desPatch = JsonUtil.jsonToMap(dataRfx)>
<#stop> <#stop>
<#break> <#break>
<#default> <#default>
<#stop > <#stop >
</#switch> </#switch>

4
RFXtoRP_HsaDespNt.ftl
View File

@@ -17,7 +17,7 @@
<#assign despNt = JsonUtil.jsonToMap(dataRfx)> <#assign despNt = JsonUtil.jsonToMap(dataRfx)>
<#stop> <#stop>
<#break> <#break>
<#case "D"> <#case "D">
<#-- *********************************************** Action = DELETE ******************** --> <#-- *********************************************** Action = DELETE ******************** -->
@@ -25,7 +25,7 @@
<#assign despNt = JsonUtil.jsonToMap(dataRfx)> <#assign despNt = JsonUtil.jsonToMap(dataRfx)>
<#stop> <#stop>
<#break> <#break>
<#default> <#default>
<#stop > <#stop >
</#switch> </#switch>

4
RFXtoRP_HsrLoadInfo.ftl
View File

@@ -18,14 +18,14 @@
<#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
<#assign depot = JsonUtil.jsonToMap(dataRfx)> <#assign depot = JsonUtil.jsonToMap(dataRfx)>
<#stop> <#stop>
<#break> <#break>
<#case "D"> <#case "D">
<#-- *********************************************** Action = DELETE *************************** --> <#-- *********************************************** Action = DELETE *************************** -->
<#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
<#assign depot = JsonUtil.jsonToMap(dataRfx)> <#assign depot = JsonUtil.jsonToMap(dataRfx)>
<#stop> <#stop>
<#break> <#break>
<#default> <#default>
<#stop > <#stop >

4
RFXtoRP_HsrPackBranch.ftl
View File

@@ -17,7 +17,7 @@
<#assign packBranch = JsonUtil.jsonToMap(dataRfx)> <#assign packBranch = JsonUtil.jsonToMap(dataRfx)>
<#stop> <#stop>
<#break> <#break>
<#case "D"> <#case "D">
<#-- *********************************************** Action = DELETE ******************** --> <#-- *********************************************** Action = DELETE ******************** -->
@@ -25,7 +25,7 @@
<#assign packBranch = JsonUtil.jsonToMap(dataRfx)> <#assign packBranch = JsonUtil.jsonToMap(dataRfx)>
<#stop> <#stop>
<#break> <#break>
<#default> <#default>
<#stop > <#stop >
</#switch> </#switch>

4
RFXtoRP_HsrPackOrder.ftl
View File

@@ -17,7 +17,7 @@
<#assign packOrder = JsonUtil.jsonToMap(dataRfx)> <#assign packOrder = JsonUtil.jsonToMap(dataRfx)>
<#stop> <#stop>
<#break> <#break>
<#case "D"> <#case "D">
<#-- *********************************************** Action = DELETE ******************** --> <#-- *********************************************** Action = DELETE ******************** -->
@@ -25,7 +25,7 @@
<#assign packOrder = JsonUtil.jsonToMap(dataRfx)> <#assign packOrder = JsonUtil.jsonToMap(dataRfx)>
<#stop> <#stop>
<#break> <#break>
<#default> <#default>
<#stop > <#stop >
</#switch> </#switch>