Merge branch 'SCPN1-6912' into 'release/1.2'
Merge branch 'SCPN1-6564' into 'release/1.2' See merge request r-d-technique/tiers/reflex-wms-connector!48
This commit is contained in:
commit
2fb5dcd103
@ -24,6 +24,8 @@
|
||||
reflexMvtStockInterface.ipg_move_type == "260" ||
|
||||
reflexMvtStockInterface.ipg_move_type == "290" ||
|
||||
reflexMvtStockInterface.ipg_move_type == "300" ||
|
||||
reflexMvtStockInterface.ipg_move_type == "350" ||
|
||||
reflexMvtStockInterface.ipg_move_type == "370" ||
|
||||
reflexMvtStockInterface.ipg_move_type == "400" ||
|
||||
reflexMvtStockInterface.ipg_move_type == "410" ||
|
||||
reflexMvtStockInterface.ipg_move_type == "420"
|
||||
|
||||
@ -10,6 +10,8 @@
|
||||
"260":"STOCK_MOVEMENT_TYPE_REQUALIFICATION",
|
||||
"290":"STOCK_MOVEMENT_TYPE_REQUALIFICATION",
|
||||
"300":"STOCK_MOVEMENT_TYPE_REQUALIFICATION",
|
||||
"350":"STOCK_MOVEMENT_TYPE_USE_OF_GOODS",
|
||||
"370":"STOCK_MOVEMENT_TYPE_USE_OF_GOODS",
|
||||
"400":"STOCK_MOVEMENT_TYPE_FIX",
|
||||
"410":"STOCK_MOVEMENT_TYPE_FIX",
|
||||
"420":"STOCK_MOVEMENT_TYPE_REQUALIFICATION"}>
|
||||
|
||||
9
RFXtoRP_HsrPrepa_HUsAdded_Metadata.ftl
Normal file
9
RFXtoRP_HsrPrepa_HUsAdded_Metadata.ftl
Normal file
@ -0,0 +1,9 @@
|
||||
<#-- use protobuf of class HsrPrepa to find Reflex WMS fields names -->
|
||||
|
||||
<#--
|
||||
"MetaData" :[
|
||||
|
||||
]
|
||||
|
||||
-->
|
||||
"MetaData": [ ]
|
||||
@ -33,7 +33,10 @@
|
||||
"Value": ${preparation_line.despatched_hds_list[0].hd_type_width}
|
||||
}
|
||||
}
|
||||
</#if>
|
||||
</#if>,
|
||||
<#-- HU Metadata inclusin inclusion -->
|
||||
<#include "RFXtoRP_HsrPrepa_HUsAdded_Metadata.ftl">
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -28,6 +28,16 @@
|
||||
<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">
|
||||
}
|
||||
]
|
||||
<#else>
|
||||
<#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "WARN">
|
||||
[
|
||||
{
|
||||
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked>
|
||||
"apiReflexPlatformID" : "${apiReflexPlatformID}",
|
||||
"datas" :
|
||||
<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">
|
||||
}
|
||||
]
|
||||
<#else>
|
||||
[
|
||||
{
|
||||
@ -45,6 +55,7 @@
|
||||
}
|
||||
]
|
||||
</#if>
|
||||
</#if>
|
||||
<#break>
|
||||
<#default>
|
||||
[
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user