From c1a600b713fcfb55cfa28f17df5c464a94fbab09 Mon Sep 17 00:00:00 2001 From: halilsen Date: Mon, 18 Oct 2021 13:16:23 +0200 Subject: [PATCH] Fix: check direct shipments correctly --- wrappers/wrapper.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/wrappers/wrapper.rb b/wrappers/wrapper.rb index a11f97f19..4f49d3065 100644 --- a/wrappers/wrapper.rb +++ b/wrappers/wrapper.rb @@ -155,9 +155,15 @@ def assert_no_relations_except_simple_shipments(vrp) vrp.units.each{ |unit| quantities[unit.id] = [] } r.linked_services.first.quantities.each{ |q| quantities[q.unit.id] << q.value } r.linked_services.last.quantities.each{ |q| quantities[q.unit.id] << q.value } - quantities.all?{ |_unit, values| + next false unless quantities.all?{ |_unit, values| values.empty? || (values.size == 2 && values.first >= 0 && values.first == -values.last) } + + next false if vrp.relations.any?{ |inner_r| # direct shipments + inner_r.type == :sequence && (r.linked_ids - inner_r.linked_ids).empty? + } + + true } end