You've already forked reflex-wms-connector
Compare commits
51 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2de7737828 | |||
| 3230207b81 | |||
| d74a5e2cf9 | |||
| 3d6afa4f30 | |||
| 3f8ee07798 | |||
| ff617683e7 | |||
| d12a852ae4 | |||
| 35819ec7b5 | |||
| baa910ab21 | |||
| d358b41bf0 | |||
| 5a870a605c | |||
| ff135736ba | |||
| 1ec9a3b9cc | |||
| 8326ae58f2 | |||
| 7093a4f6b0 | |||
| f0cde8df26 | |||
| 2c90e2a4b7 | |||
| 2964fca6ff | |||
| 9d27a37cef | |||
| 5a423592f7 | |||
| f213aa0e07 | |||
| 7b1f594de3 | |||
| b040ae5672 | |||
| d7e56e6ecb | |||
| 290b232f39 | |||
| 689c9e870b | |||
| b78d04bfba | |||
| 62688a15c4 | |||
| db3e72699e | |||
| eaeed34a73 | |||
| fcddee4196 | |||
| d92fa3e2df | |||
| 7db9eae7eb | |||
| c16b522308 | |||
| 7246a2a117 | |||
| a9aac3269e | |||
| ec844cbe49 | |||
| 39c8280fa4 | |||
| 7cbc5111e9 | |||
| 0d3b459386 | |||
| 71fdf435bd | |||
| 7f55b4f86a | |||
| ca5ba7c103 | |||
| 7e054d70d2 | |||
| 75ab1602d4 | |||
| 831e6f098b | |||
| 19de302683 | |||
| 6d4e2d5949 | |||
| 4d0382970f | |||
| 218cf62dae | |||
| 6ed0f8e9da |
@@ -358,7 +358,7 @@
|
|||||||
]
|
]
|
||||||
</#switch>
|
</#switch>
|
||||||
<#break>
|
<#break>
|
||||||
<#-- *********************************************** ApiRestID = canceled ******************** -->
|
<#-- *********************************************** ApiRestID = status ******************** -->
|
||||||
<#case "status_appointment_put_update_by_ref">
|
<#case "status_appointment_put_update_by_ref">
|
||||||
<#case "status_appointment_put_update_by_number">
|
<#case "status_appointment_put_update_by_number">
|
||||||
<#switch restResponsetMsg.status!no_status>
|
<#switch restResponsetMsg.status!no_status>
|
||||||
|
|||||||
@@ -37,10 +37,14 @@
|
|||||||
<#include "RPtoRFX_CarrierAppointmentDefaultData.ftl">
|
<#include "RPtoRFX_CarrierAppointmentDefaultData.ftl">
|
||||||
<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING >
|
<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING >
|
||||||
<#if appointment.Unloading?? && appointment.Unloading.Projects?? &&
|
<#if appointment.Unloading?? && appointment.Unloading.Projects?? &&
|
||||||
appointment.Unloading.Projects[0]?? &&
|
appointment.Unloading.Projects[0]?? &&
|
||||||
appointment.Unloading.Projects[0].Commissions??>
|
appointment.Unloading.Projects[0].Commissions?? >
|
||||||
"physical_receipt_list": [
|
<#if (appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID!"") == "" &&
|
||||||
<#list appointment.Unloading.Projects[0].Commissions?filter(l ->l.ExecutionflowID?? && l.ExecutionflowID !="") as commission>
|
(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>
|
<#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.key == commission.ExecutionflowID && l.value?? && l.value?has_content) as custom>
|
||||||
{
|
{
|
||||||
"receipt_activity": "${custom.value.activity_code?json_string}",
|
"receipt_activity": "${custom.value.activity_code?json_string}",
|
||||||
@@ -53,9 +57,9 @@
|
|||||||
</#list>
|
</#list>
|
||||||
<#sep>,</#sep>
|
<#sep>,</#sep>
|
||||||
</#list>
|
</#list>
|
||||||
],
|
],
|
||||||
"anticipated_receipt_list": [
|
"anticipated_receipt_list": [
|
||||||
<#list appointment.Unloading.Projects[0].Commissions?filter(l -> (!(l.ExecutionflowID??) || l.ExecutionflowID =="") && (l.OrderID?? && l.OrderID !="")) as commission>
|
<#list appointment.Unloading.Projects[0].Commissions?filter(l -> (!(l.ExecutionflowID??) || l.ExecutionflowID =="") && (l.OrderID?? && l.OrderID !="")) as commission>
|
||||||
<#list eventRP.orderCustomFields.entrySet()?filter(l ->l.key == commission.OrderID && l.value?? && l.value?has_content) as custom>
|
<#list eventRP.orderCustomFields.entrySet()?filter(l ->l.key == commission.OrderID && l.value?? && l.value?has_content) as custom>
|
||||||
{
|
{
|
||||||
"activity": "${custom.value.activity_code?json_string}",
|
"activity": "${custom.value.activity_code?json_string}",
|
||||||
@@ -69,9 +73,8 @@
|
|||||||
</#list>
|
</#list>
|
||||||
<#sep>,</#sep>
|
<#sep>,</#sep>
|
||||||
</#list>
|
</#list>
|
||||||
],
|
],
|
||||||
<#else>
|
</#if>
|
||||||
"appointment_designation":"${(appointment.Reason!"")!?json_string}",
|
|
||||||
</#if>
|
</#if>
|
||||||
<#else>
|
<#else>
|
||||||
<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING>
|
<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING>
|
||||||
|
|||||||
Reference in New Issue
Block a user