@flowselections/logistiek-engine 1.0.216 → 1.0.219

package/db/schema/logistiek-engine.sql

@@ -37182,3 +37182,469 @@ RETURNS TABLE(punt text, ok boolean, uitleg text) LANGUAGE sql STABLE SECURITY D
   UNION ALL SELECT 'guard', position('logistics_acc_guard' IN pg_get_functiondef('public.logistics_ladingdrager_kies(jsonb)'::regprocedure)) > 0, 'Keuze controleert de aanroeper'
 $$;
 GRANT EXECUTE ON FUNCTION public.logistics_install_check_215() TO authenticated, service_role;
+
+-- ===================== 1.0.217 =====================
+
+-- Hulp: één ref → canoniek artikel (Voorraad), fouten als reden (geen stille keuze).
+CREATE OR REPLACE FUNCTION public.logistics_canon_ref(p_ref text)
+RETURNS TABLE(pid uuid, tkey text, reden text)
+LANGUAGE plpgsql STABLE SECURITY DEFINER SET search_path TO 'public' AS $function$
+BEGIN
+  PERFORM public.logistics_acc_guard('ingelogd', 'logistics_canon_ref');
+  pid := NULL; tkey := NULL; reden := NULL;
+  IF p_ref IS NULL OR btrim(p_ref) = '' THEN reden := 'artikel onbekend'; RETURN NEXT; RETURN; END IF;
+  BEGIN
+    SELECT c.product_id, c.trade_item_key INTO pid, tkey FROM public.voorraad_canoniek_artikel(p_ref::text) c LIMIT 1;
+  EXCEPTION WHEN SQLSTATE 'VR010' THEN reden := SQLERRM;
+            WHEN others THEN reden := 'artikel niet te herleiden: ' || SQLERRM;
+  END;
+  IF reden IS NULL AND tkey IS NULL THEN reden := 'artikel onbekend'; END IF;
+  RETURN NEXT;
+END $function$;
+GRANT EXECUTE ON FUNCTION public.logistics_canon_ref(text) TO authenticated, service_role;
+
+-- 1. Voorraadcontrole nieuwe order: canoniek artikel (Voorraad) + trade_item_stock (fysiek − gereserveerd).
+CREATE OR REPLACE FUNCTION public.logistics_check_order_allowed(p_lines jsonb, p_strategy_id uuid DEFAULT NULL::uuid)
+ RETURNS jsonb
+ LANGUAGE plpgsql
+ STABLE SECURITY DEFINER
+ SET search_path TO 'public'
+AS $function$
+DECLARE
+  v_allow boolean := public.logistics_backorder_allowed(p_strategy_id);
+  v_canon boolean := to_regprocedure('public.voorraad_canoniek_artikel(text)') IS NOT NULL;
+  v_shortages jsonb := '[]'::jsonb;
+  r record;
+BEGIN
+  PERFORM public.logistics_acc_guard('ingelogd', 'logistics_check_order_allowed');
+  IF p_lines IS NULL OR jsonb_typeof(p_lines) <> 'array' THEN
+    RETURN jsonb_build_object('allowed', true, 'allowBackorder', v_allow, 'shortages', '[]'::jsonb);
+  END IF;
+
+  IF NOT v_canon THEN
+    -- Terugval zonder Voorraad-module: oude regel, bron zichtbaar.
+    SELECT COALESCE(jsonb_agg(s ORDER BY s->>'product'), '[]'::jsonb) INTO v_shortages
+    FROM (
+      SELECT jsonb_build_object('productId', p.id, 'product', COALESCE(p.product, l2.ref),
+               'wanted', l2.wanted, 'available', COALESCE(p.quantity, 0),
+               'missing', l2.wanted - COALESCE(p.quantity, 0), 'bron', 'products.quantity') AS s
+      FROM (SELECT COALESCE(e->>'productId', e->>'product_id', e->>'productRef', e->>'ref') AS ref,
+                   SUM(COALESCE((e->>'quantity')::numeric, 0)) AS wanted
+              FROM jsonb_array_elements(p_lines) e GROUP BY 1) l2
+      LEFT JOIN LATERAL (SELECT * FROM public.products p
+                          WHERE p.id = public.logistics_try_uuid(l2.ref) OR p.article_number = l2.ref
+                             OR p.barcode = l2.ref OR p.floriday_trade_item_id = l2.ref OR p.trade_item_key = l2.ref
+                          ORDER BY (p.id = public.logistics_try_uuid(l2.ref)) DESC NULLS LAST LIMIT 1) p ON true
+      WHERE l2.wanted > COALESCE(p.quantity, 0)) q;
+  ELSE
+    FOR r IN
+      SELECT min(a.ref) AS ref, (array_agg(a.pid))[1] AS pid, a.tkey, min(a.reden) AS reden, SUM(a.wanted) AS wanted,
+             (SELECT GREATEST(COALESCE(SUM(s.physical_stock), 0) - COALESCE(SUM(s.reserved_stock), 0), 0)
+                FROM public.trade_item_stock s WHERE s.trade_item_key = a.tkey AND s.archived_at IS NULL) AS available
+        FROM (SELECT l2.ref, c.pid, c.tkey, c.reden, l2.wanted
+                FROM (SELECT COALESCE(e->>'productId', e->>'product_id', e->>'productRef', e->>'ref') AS ref,
+                             SUM(COALESCE((e->>'quantity')::numeric, 0)) AS wanted
+                        FROM jsonb_array_elements(p_lines) e GROUP BY 1) l2,
+                     LATERAL public.logistics_canon_ref(l2.ref) c) a GROUP BY a.tkey, CASE WHEN a.tkey IS NULL THEN a.ref END
+    LOOP
+      IF r.reden IS NOT NULL OR r.wanted > COALESCE(r.available, 0) THEN
+        v_shortages := v_shortages || jsonb_build_object(
+          'productId', r.pid,
+          'product', COALESCE((SELECT p.product FROM public.products p WHERE p.id = r.pid), r.ref),
+          'wanted', r.wanted,
+          'available', CASE WHEN r.reden IS NULL THEN COALESCE(r.available, 0) ELSE 0 END,
+          'missing', r.wanted - CASE WHEN r.reden IS NULL THEN COALESCE(r.available, 0) ELSE 0 END,
+          'tradeItemKey', r.tkey,
+          'bron', 'trade_item_stock (physical_stock − reserved_stock), canoniek artikel',
+          'reden', r.reden);
+      END IF;
+    END LOOP;
+  END IF;
+
+  RETURN jsonb_build_object(
+    'allowed', v_allow OR jsonb_array_length(v_shortages) = 0,
+    'allowBackorder', v_allow,
+    'shortages', v_shortages,
+    'bron', CASE WHEN v_canon THEN 'voorraad_canoniek_artikel' ELSE 'products.quantity (Voorraad-module ontbreekt)' END,
+    'reason', CASE WHEN NOT v_allow AND jsonb_array_length(v_shortages) > 0 THEN 'insufficient_stock' ELSE NULL END);
+END;
+$function$;
+
+-- 2. Reserveringssleutel: zelfde regel als Voorraad — voorraad_canoniek_artikel(ref::text).trade_item_key.
+CREATE OR REPLACE FUNCTION public.logistics_reserved_key(p_key text)
+ RETURNS text
+ LANGUAGE plpgsql
+ SECURITY DEFINER
+ SET search_path TO 'public'
+AS $function$
+DECLARE
+  v_raw text;
+  v_key text;
+  v_pid uuid;
+BEGIN
+  PERFORM public.logistics_acc_guard('server', 'logistics_reserved_key');
+  IF p_key IS NULL OR btrim(p_key) = '' THEN RETURN NULL; END IF;
+  v_raw := btrim(p_key);
+
+  IF to_regprocedure('public.voorraad_canoniek_artikel(text)') IS NOT NULL THEN
+    BEGIN
+      SELECT c.trade_item_key INTO v_key FROM public.voorraad_canoniek_artikel(v_raw::text) c LIMIT 1;
+    EXCEPTION
+      WHEN SQLSTATE 'VR010' THEN RETURN NULL;   -- meerdere artikelen: niets kiezen (fail-closed)
+      WHEN others THEN v_key := NULL;
+    END;
+    IF v_key IS NOT NULL AND EXISTS (SELECT 1 FROM public.trade_item_stock s
+                                      WHERE s.trade_item_key = v_key AND s.archived_at IS NULL) THEN
+      RETURN v_key;
+    END IF;
+    v_key := NULL;
+  END IF;
+
+  -- Terugval: regel van vóór 1.0.217.
+  v_key := public.ensure_trade_item_stock_row_key(v_raw);
+  IF v_key IS NOT NULL THEN RETURN v_key; END IF;
+
+  BEGIN
+    v_pid := CASE WHEN v_raw LIKE 'product:%' THEN substring(v_raw from 9)::uuid ELSE v_raw::uuid END;
+  EXCEPTION WHEN others THEN
+    v_pid := NULL;
+  END;
+
+  IF v_pid IS NOT NULL THEN
+    SELECT COALESCE(NULLIF(btrim(COALESCE(p.floriday_trade_item_id, '')), ''),
+                    NULLIF(btrim(COALESCE(p.trade_item_key, '')), ''), p.id::text)
+      INTO v_key FROM public.products p WHERE p.id = v_pid LIMIT 1;
+  ELSE
+    SELECT COALESCE(NULLIF(btrim(COALESCE(p.floriday_trade_item_id, '')), ''),
+                    NULLIF(btrim(COALESCE(p.trade_item_key, '')), ''), p.id::text)
+      INTO v_key FROM public.products p
+     WHERE p.floriday_trade_item_id = v_raw OR p.trade_item_key = v_raw LIMIT 1;
+  END IF;
+  v_key := COALESCE(v_key, v_raw);
+
+  IF EXISTS (SELECT 1 FROM public.trade_item_stock s WHERE s.trade_item_key = v_key) THEN
+    RETURN v_key;
+  END IF;
+  RETURN NULL;
+END
+$function$;
+
+-- 3. Dagtelling: unieke fysieke karren per dag; orders zonder kar apart.
+CREATE OR REPLACE FUNCTION public.logistics_capacity_day_load(p_from date, p_to date, p_user uuid, p_settings jsonb)
+RETURNS TABLE(d date, carts integer, required numeric, zonder_kar integer)
+LANGUAGE sql STABLE SECURITY DEFINER SET search_path TO 'public' AS $$
+  WITH t AS (
+    SELECT DISTINCT ON (t.order_ref) t.order_ref, (t.planned_start AT TIME ZONE public.logistics_tz())::date AS d
+      FROM public.logistics_tasks t
+     WHERE t.task_type = 'pick.execute' AND t.status NOT IN ('done','cancelled') AND NOT t.shadow
+       AND t.planned_start IS NOT NULL AND (p_user IS NULL OR t.user_id = p_user)
+       AND (t.planned_start AT TIME ZONE public.logistics_tz())::date BETWEEN p_from AND p_to
+     ORDER BY t.order_ref, t.planned_start
+  ),
+  o AS (SELECT t.d, t.order_ref, o.id FROM t JOIN public.orders o ON o.order_number = t.order_ref AND o.deleted_at IS NULL),
+  k AS (
+    SELECT DISTINCT ON (u.cart_id) u.cart_id, o.d
+      FROM o, LATERAL public.logistics_order_unit_carts_core(ARRAY[o.id]) u
+     ORDER BY u.cart_id, o.d
+  ),
+  kc AS (
+    SELECT k.d, count(*)::int AS carts,
+           SUM(public.logistics_carrier_minutes(COALESCE(c.carrier_type, 'trolley'), p_settings)) AS mins
+      FROM k JOIN public.order_carts c ON c.id = k.cart_id GROUP BY k.d
+  ),
+  zk AS (
+    SELECT t.d, count(*)::int AS n FROM t
+     WHERE NOT EXISTS (SELECT 1 FROM o JOIN LATERAL public.logistics_order_unit_carts_core(ARRAY[o.id]) u ON true
+                        WHERE o.order_ref = t.order_ref)
+     GROUP BY t.d
+  ),
+  dd AS (SELECT DISTINCT t.d FROM t)
+  SELECT dd.d, COALESCE(kc.carts, 0), COALESCE(NULLIF(kc.mins, 0), COALESCE(kc.carts, 0) * 15)::numeric, COALESCE(zk.n, 0)
+    FROM dd LEFT JOIN kc ON kc.d = dd.d LEFT JOIN zk ON zk.d = dd.d
+   ORDER BY dd.d;
+$$;
+GRANT EXECUTE ON FUNCTION public.logistics_capacity_day_load(date, date, uuid, jsonb) TO authenticated, service_role;
+
+DO $do$
+DECLARE d text; n text;
+BEGIN
+  d := pg_get_functiondef('public.logistics_capacity_day_check(date,date)'::regprocedure);
+  IF position('logistics_capacity_day_load' IN d) = 0 THEN
+    n := regexp_replace(d, 'FOR v_day IN\s+SELECT d,.*?ORDER BY d\s+LOOP',
+           'FOR v_day IN SELECT * FROM public.logistics_capacity_day_load(p_from, v_to, v_user, v_settings) LOOP', 's');
+    IF n = d THEN RAISE EXCEPTION 'patroon capacity_day_check (lus) niet gevonden'; END IF;
+    d := n;
+    n := replace(d, $a$'carts', v_day.carts,$a$, $a$'carts', v_day.carts,
+      'ordersZonderKar', v_day.zonder_kar,$a$);
+    IF n = d THEN RAISE EXCEPTION 'patroon capacity_day_check (carts) niet gevonden'; END IF;
+    EXECUTE n;
+  END IF;
+END $do$;
+
+CREATE OR REPLACE FUNCTION public.logistics_install_check_217()
+RETURNS TABLE(punt text, ok boolean, uitleg text) LANGUAGE sql STABLE SECURITY DEFINER SET search_path TO 'public' AS $$
+  SELECT 'Voorraad canoniek artikel aanwezig', to_regprocedure('public.voorraad_canoniek_artikel(text)') IS NOT NULL,
+         'Zonder deze functie valt de Engine terug op de oude regel (bron zichtbaar in het antwoord)'
+  UNION ALL SELECT 'voorraadcontrole canoniek', position('voorraad_canoniek_artikel' IN pg_get_functiondef('public.logistics_check_order_allowed(jsonb,uuid)'::regprocedure)) > 0,
+         'Beschikbaar = physical_stock − reserved_stock (archived_at IS NULL) van de canonieke sleutel'
+  UNION ALL SELECT 'reserveringssleutel canoniek', position('voorraad_canoniek_artikel' IN pg_get_functiondef('public.logistics_reserved_key(text)'::regprocedure)) > 0,
+         'voorraad_canoniek_artikel(ref::text).trade_item_key, anders oude regel'
+  UNION ALL SELECT 'dagtelling unieke karren', position('logistics_capacity_day_load' IN pg_get_functiondef('public.logistics_capacity_day_check(date,date)'::regprocedure)) > 0,
+         'Gedeelde kar telt één keer; orders zonder kar apart (ordersZonderKar)'
+  UNION ALL SELECT 'guards', position('logistics_acc_guard' IN pg_get_functiondef('public.logistics_check_order_allowed(jsonb,uuid)'::regprocedure)) > 0
+                         AND position('logistics_acc_guard' IN pg_get_functiondef('public.logistics_reserved_key(text)'::regprocedure)) > 0,
+         'Aanroeper wordt intern gecontroleerd'
+$$;
+GRANT EXECUTE ON FUNCTION public.logistics_install_check_217() TO authenticated, service_role;
+
+
+-- ===== 1.0.218 =====
+-- ===== 1.0.218 eigen vervoer / klant haalt op =====
+DO $fs$ BEGIN
+  IF EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'orders_carrier_source_check')
+     AND position('eigen_vervoer' IN (SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'orders_carrier_source_check' LIMIT 1)) = 0 THEN
+    ALTER TABLE public.orders DROP CONSTRAINT orders_carrier_source_check;
+  END IF;
+  IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'orders_carrier_source_check') THEN
+    ALTER TABLE public.orders ADD CONSTRAINT orders_carrier_source_check CHECK (carrier_source IS NULL OR carrier_source IN
+      ('handmatig','afleverlocatie','afleverlocatie_gln','klant','werkgebied','favoriet','geen','oud','eigen_vervoer')) NOT VALID;
+  END IF;
+END $fs$;
+
+CREATE OR REPLACE FUNCTION public.logistics_order_own_transport(p_custom_fields jsonb)
+ RETURNS boolean LANGUAGE sql IMMUTABLE SET search_path TO 'public'
+AS $function$
+  SELECT CASE jsonb_typeof(p_custom_fields->'own_transport')
+    WHEN 'object' THEN p_custom_fields->'own_transport' <> '{}'::jsonb
+    WHEN 'boolean' THEN (p_custom_fields->>'own_transport')::boolean
+    WHEN 'string' THEN coalesce(nullif(btrim(lower(p_custom_fields->>'own_transport')), ''), 'false') NOT IN ('false','0','nee','no')
+    WHEN 'number' THEN (p_custom_fields->>'own_transport')::numeric <> 0
+    WHEN 'array' THEN jsonb_array_length(p_custom_fields->'own_transport') > 0
+    ELSE false END
+$function$;
+GRANT EXECUTE ON FUNCTION public.logistics_order_own_transport(jsonb) TO authenticated, service_role;
+
+-- Soort vertrek van een order (orders-rij als jsonb): extern | eigen_vervoer | klant_haalt_op.
+CREATE OR REPLACE FUNCTION public.logistics_order_transport_group(p_order jsonb)
+ RETURNS text LANGUAGE plpgsql STABLE SECURITY DEFINER SET search_path TO 'public'
+AS $function$
+DECLARE cf jsonb := CASE WHEN jsonb_typeof(p_order->'custom_fields') = 'object' THEN p_order->'custom_fields' ELSE '{}'::jsonb END;
+  v_id uuid; v_kind text;
+BEGIN
+  PERFORM public.logistics_acc_guard('ingelogd', 'logistics_order_transport_group');
+  IF public.logistics_order_own_transport(cf) THEN RETURN 'eigen_vervoer'; END IF;
+  v_id := public.logistics_try_uuid(p_order->>'carrier_id');
+  IF v_id IS NOT NULL THEN
+    SELECT to_jsonb(c)->>'carrier_kind' INTO v_kind FROM public.carriers c WHERE c.id = v_id;
+    IF v_kind IN ('eigen_vervoer', 'klant_haalt_op') THEN RETURN v_kind; END IF;
+    RETURN 'extern';
+  END IF;
+  -- Zonder vervoerder maar met een bron (afleverlocatie self_pickup) = klant haalt op.
+  IF coalesce(p_order->>'carrier_source', 'geen') NOT IN ('geen', 'eigen_vervoer') THEN RETURN 'klant_haalt_op'; END IF;
+  RETURN 'extern';
+END $function$;
+GRANT EXECUTE ON FUNCTION public.logistics_order_transport_group(jsonb) TO authenticated, service_role;
+
+-- Resolverstap eigen vervoer: NULL = niet van toepassing.
+CREATE OR REPLACE FUNCTION public.logistics_own_transport_carrier(p_order jsonb, p_skip_manual boolean)
+ RETURNS jsonb LANGUAGE plpgsql STABLE SECURITY DEFINER SET search_path TO 'public'
+AS $function$
+DECLARE cf jsonb := CASE WHEN jsonb_typeof(p_order->'custom_fields') = 'object' THEN p_order->'custom_fields' ELSE '{}'::jsonb END;
+  v_id uuid; v_kind text; v_skips text[] := '{}'::text[]; v_ids uuid[]; v_reden text;
+BEGIN
+  PERFORM public.logistics_acc_guard('server', 'logistics_own_transport_carrier');
+  IF NOT public.logistics_order_own_transport(cf) THEN RETURN NULL; END IF;
+  v_id := public.logistics_try_uuid(p_order->>'carrier_id');
+  IF v_id IS NOT NULL AND NOT p_skip_manual AND p_order->>'carrier_source' = 'handmatig' THEN
+    SELECT to_jsonb(c)->>'carrier_kind' INTO v_kind FROM public.carriers c WHERE c.id = v_id;
+    IF v_kind = 'eigen_vervoer' AND public.logistics_carrier_skip_reason(v_id) IS NULL THEN
+      RETURN public.logistics_carrier_result(v_id, 'handmatig', 'Handmatig gekozen: eigen vervoer.', v_skips);
+    END IF;
+    v_skips := v_skips || 'handmatige vervoerder is geen eigen vervoer'::text;
+  END IF;
+  SELECT array_agg(c.id ORDER BY c.id) INTO v_ids FROM public.carriers c
+   WHERE to_jsonb(c)->>'carrier_kind' = 'eigen_vervoer' AND nullif(to_jsonb(c)->>'archived_at', '') IS NULL;
+  IF coalesce(cardinality(v_ids), 0) = 1 THEN
+    RETURN public.logistics_carrier_result(v_ids[1], 'eigen_vervoer', 'Eigen vervoer op de order; vervoerder met soort eigen vervoer.', v_skips);
+  END IF;
+  v_reden := CASE WHEN coalesce(cardinality(v_ids), 0) = 0
+    THEN 'Eigen vervoer op de order, maar er is geen vervoerder met soort eigen vervoer. Er is geen andere vervoerder gekozen.'
+    ELSE 'Eigen vervoer op de order, maar er zijn ' || cardinality(v_ids) || ' vervoerders met soort eigen vervoer. Er is geen vervoerder gekozen.' END;
+  RETURN jsonb_build_object('carrier_id', NULL, 'carrier_name', 'Eigen vervoer', 'carrier_kind', 'eigen_vervoer',
+    'bron', 'geen', 'reden', v_reden, 'waarschuwing', v_reden, 'overgeslagen', to_jsonb(v_skips));
+END $function$;
+REVOKE ALL ON FUNCTION public.logistics_own_transport_carrier(jsonb, boolean) FROM PUBLIC, anon;
+GRANT EXECUTE ON FUNCTION public.logistics_own_transport_carrier(jsonb, boolean) TO authenticated, service_role;
+
+-- Bestaande functies gericht aanvullen (luid falen als het patroon ontbreekt).
+DO $do$
+DECLARE d text; n text; f record; v_hit int := 0;
+BEGIN
+  -- resolver
+  d := pg_get_functiondef('public.logistics_resolve_carrier_core(jsonb,boolean)'::regprocedure);
+  IF position('logistics_own_transport_carrier' IN d) = 0 THEN
+    n := replace(d, $p$PERFORM public.logistics_acc_guard('server', 'logistics_resolve_carrier_core');$p$,
+      $p$PERFORM public.logistics_acc_guard('server', 'logistics_resolve_carrier_core');
+  IF public.logistics_own_transport_carrier(p_order, p_skip_manual) IS NOT NULL THEN
+    RETURN public.logistics_own_transport_carrier(p_order, p_skip_manual);
+  END IF;$p$);
+    IF n = d THEN RAISE EXCEPTION '1.0.218: patroon resolver niet gevonden'; END IF;
+    EXECUTE n;
+  END IF;
+  -- set_order_carrier: externe vervoerder bij eigen vervoer weigeren
+  d := pg_get_functiondef('public.logistics_set_order_carrier(uuid,uuid,uuid)'::regprocedure);
+  IF position('logistics_order_own_transport' IN d) = 0 THEN
+    n := replace(d, $p$    IF v_skip IS NOT NULL THEN RAISE EXCEPTION 'Deze vervoerder kan niet gekozen worden: %.', v_skip; END IF;$p$,
+      $p$    IF v_skip IS NOT NULL THEN RAISE EXCEPTION 'Deze vervoerder kan niet gekozen worden: %.', v_skip; END IF;
+    IF public.logistics_order_own_transport(o->'custom_fields')
+       AND coalesce((SELECT to_jsonb(ca)->>'carrier_kind' FROM public.carriers ca WHERE ca.id = p_carrier_id), '') <> 'eigen_vervoer' THEN
+      RAISE EXCEPTION 'Deze order heeft eigen vervoer; kies een vervoerder met soort eigen vervoer.' USING ERRCODE = '22023';
+    END IF;$p$);
+    IF n = d THEN RAISE EXCEPTION '1.0.218: patroon set_order_carrier niet gevonden'; END IF;
+    EXECUTE n;
+  END IF;
+  -- trigger: own_transport-wijziging herberekent, ook na handmatige externe keuze
+  d := pg_get_functiondef('public.logistics_orders_carrier_fill()'::regprocedure);
+  IF position('own_transport' IN d) = 0 THEN
+    n := replace(d, $p$    IF OLD.carrier_source = 'handmatig' THEN RETURN NEW; END IF;$p$,
+      $p$    IF OLD.carrier_source = 'handmatig'
+       AND (NEW.custom_fields->'own_transport') IS NOT DISTINCT FROM (OLD.custom_fields->'own_transport') THEN RETURN NEW; END IF;$p$);
+    n := replace(n, $p$       AND (NEW.custom_fields->>'carrier') IS NOT DISTINCT FROM (OLD.custom_fields->>'carrier') THEN$p$,
+      $p$       AND (NEW.custom_fields->>'carrier') IS NOT DISTINCT FROM (OLD.custom_fields->>'carrier')
+       AND (NEW.custom_fields->'own_transport') IS NOT DISTINCT FROM (OLD.custom_fields->'own_transport') THEN$p$);
+    IF position('own_transport' IN n) = 0 THEN RAISE EXCEPTION '1.0.218: patroon carrier_fill niet gevonden'; END IF;
+    EXECUTE n;
+  END IF;
+  -- bufferpayload: soort vertrek meegeven
+  d := pg_get_functiondef('public.logistics_buffer_payload(uuid)'::regprocedure);
+  IF position('transportGroup' IN d) = 0 THEN
+    n := replace(d, $p$'isReservation', COALESCE(o.is_reservation, false)$p$,
+      $p$'isReservation', COALESCE(o.is_reservation, false),
+      'transportGroup', public.logistics_order_transport_group(to_jsonb(o))$p$);
+    IF n = d THEN RAISE EXCEPTION '1.0.218: patroon buffer_payload niet gevonden'; END IF;
+    EXECUTE n;
+  END IF;
+  -- buffersleutel: niet-extern altijd apart (extern ongewijzigd = bestaande sleutels blijven gelijk)
+  FOR f IN SELECT p.oid FROM pg_proc p JOIN pg_namespace s ON s.oid = p.pronamespace
+            WHERE s.nspname = 'public' AND p.proname LIKE 'logistics_buffer_decision%' LOOP
+    d := pg_get_functiondef(f.oid);
+    IF position('v_parts := ARRAY(SELECT DISTINCT ON (p) p FROM unnest(v_parts)' IN d) > 0 THEN
+      v_hit := v_hit + 1;
+      IF position('transport_group' IN d) = 0 THEN
+        n := replace(d, $p$  v_parts := ARRAY(SELECT DISTINCT ON (p) p FROM unnest(v_parts)$p$,
+          $p$  IF coalesce(p_order ->> 'transportGroup', 'extern') IN ('eigen_vervoer', 'klant_haalt_op') THEN
+    v_parts := v_parts || ('vervoer=' || (p_order ->> 'transportGroup'));
+    v_trace := v_trace || jsonb_build_array(jsonb_build_object('rule', 'transport_group', 'value', p_order ->> 'transportGroup', 'result', true,
+      'message', CASE p_order ->> 'transportGroup' WHEN 'eigen_vervoer' THEN 'Eigen vervoer wordt alleen samen gebufferd met andere orders met eigen vervoer.'
+                 ELSE 'Klant haalt op wordt alleen samen gebufferd met andere orders die de klant ophaalt.' END));
+  END IF;
+  v_parts := ARRAY(SELECT DISTINCT ON (p) p FROM unnest(v_parts)$p$);
+        EXECUTE n;
+      END IF;
+    END IF;
+  END LOOP;
+  IF v_hit = 0 THEN RAISE EXCEPTION '1.0.218: buffersleutel niet gevonden'; END IF;
+  -- verouderd: gemengde soorten op één kar (alleen melding)
+  d := pg_get_functiondef('public.logistics_cart_verouderd_core(uuid)'::regprocedure);
+  IF position('logistics_cart_vervoer_gemengd' IN d) = 0 THEN
+    n := replace(d, $p$  v_r := public.logistics_cart_regels_verouderd_core(p_cart_id);$p$,
+      $p$  v_r := public.logistics_cart_vervoer_gemengd(p_cart_id);
+  IF v_r IS NOT NULL THEN
+    RETURN jsonb_build_object('verouderd', true, 'reden', 'vervoer_gemengd', 'tekst', v_r->>'tekst', 'blokkade', NULL);
+  END IF;
+  v_r := public.logistics_cart_regels_verouderd_core(p_cart_id);$p$);
+    IF n = d THEN RAISE EXCEPTION '1.0.218: patroon cart_verouderd_core niet gevonden'; END IF;
+    -- hulpfunctie eerst
+    EXECUTE $h$CREATE OR REPLACE FUNCTION public.logistics_cart_vervoer_gemengd(p_cart_id uuid)
+ RETURNS jsonb LANGUAGE sql STABLE SET search_path TO 'public'
+AS $f$
+  WITH k AS (SELECT oc.order_id, oc.buffer_id FROM public.order_carts oc WHERE oc.id = p_cart_id),
+  o AS (SELECT DISTINCT x.id, x.order_number, public.logistics_order_transport_group(to_jsonb(x)) g
+          FROM public.orders x, k
+         WHERE x.deleted_at IS NULL AND (x.id = k.order_id OR (k.buffer_id IS NOT NULL AND x.buffer_id = k.buffer_id)))
+  SELECT CASE WHEN count(DISTINCT g) > 1 THEN jsonb_build_object('soorten', jsonb_agg(DISTINCT g),
+    'tekst', 'Op deze kar staan verschillende soorten vertrek (' ||
+      string_agg(order_number || ': ' || CASE g WHEN 'eigen_vervoer' THEN 'eigen vervoer' WHEN 'klant_haalt_op' THEN 'klant haalt op' ELSE 'vervoerder' END, ', ' ORDER BY order_number)
+      || '); die worden niet samen gebufferd.') END
+  FROM o
+$f$$h$;
+    EXECUTE n;
+  END IF;
+END $do$;
+GRANT EXECUTE ON FUNCTION public.logistics_cart_vervoer_gemengd(uuid) TO service_role;
+
+-- Voorbeeldberekening: reden bij soort vertrek.
+CREATE OR REPLACE FUNCTION public.logistics_rebuffer_simulate_open()
+ RETURNS TABLE(id uuid, order_number text, delivery_date text, buffer_id uuid, cur_label text, new_label text, changed boolean, reason text)
+ LANGUAGE plpgsql
+ STABLE SECURITY DEFINER
+ SET search_path TO 'public'
+AS $function$
+BEGIN
+  PERFORM public.logistics_acc_guard('server', 'logistics_rebuffer_simulate_open');
+  RETURN QUERY
+  WITH c AS MATERIALIZED (
+    SELECT o.id, o.order_number, o.delivery_date, o.buffer_id, public.logistics_buffer_target(o.id) AS t,
+           public.logistics_order_afgemeld(o.id) AS afgemeld,
+           (o.buffer_id IS NOT NULL AND coalesce(public.logistics_buffer_frozen(o.buffer_id), false)) AS buf_vast,
+           public.logistics_order_transport_group(to_jsonb(o)) AS grp
+      FROM public.orders o JOIN public.logistics_rebuffer_candidates() k ON k.order_id = o.id
+  ), m AS (
+    SELECT c.*,
+      (c.afgemeld OR c.buf_vast) AS beschermd,
+      (SELECT array_agg(x.id ORDER BY x.id) FROM public.orders x WHERE c.buffer_id IS NOT NULL AND x.buffer_id = c.buffer_id AND x.deleted_at IS NULL AND x.id <> c.id) AS cur_mates,
+      (SELECT array_agg(x.id ORDER BY x.id) FROM public.orders x WHERE c.t->>'soort' = 'buffer' AND x.buffer_id = (c.t->>'bufferId')::uuid AND x.deleted_at IS NULL AND x.id <> c.id) AS new_mates,
+      EXISTS (SELECT 1 FROM public.orders x WHERE c.buffer_id IS NOT NULL AND x.buffer_id = c.buffer_id AND x.deleted_at IS NULL AND x.id <> c.id
+                AND public.logistics_order_transport_group(to_jsonb(x)) <> c.grp) AS gemengd
+      FROM c
+  ), l AS (
+    SELECT m.*,
+      CASE WHEN m.buffer_id IS NULL THEN 'Geen buffer (eigen kar)'
+           WHEN m.cur_mates IS NULL THEN 'Eigen buffer'
+           ELSE 'Buffer met ' || (SELECT string_agg(x.order_number, ', ' ORDER BY x.order_number) FROM public.orders x WHERE x.id = ANY(m.cur_mates)) END AS cur_l,
+      CASE m.grp WHEN 'eigen_vervoer' THEN 'eigen vervoer' WHEN 'klant_haalt_op' THEN 'klant haalt op' ELSE 'vervoerder' END AS grp_t
+      FROM m
+  )
+  SELECT l.id, l.order_number, l.delivery_date, l.buffer_id, l.cur_l,
+    CASE WHEN l.beschermd THEN l.cur_l
+         WHEN l.t->>'soort' IN ('solo','uitgesloten') THEN 'Geen buffer (eigen kar)'
+         WHEN l.new_mates IS NULL THEN 'Eigen buffer'
+         ELSE 'Buffer met ' || (SELECT string_agg(x.order_number, ', ' ORDER BY x.order_number) FROM public.orders x WHERE x.id = ANY(l.new_mates)) END,
+    CASE WHEN l.beschermd THEN false
+         ELSE coalesce(l.cur_mates, '{}') IS DISTINCT FROM coalesce(l.new_mates, '{}')
+           OR ((l.t->>'soort') IN ('solo','uitgesloten') AND l.buffer_id IS NOT NULL AND l.cur_mates IS NOT NULL) END,
+    CASE WHEN l.afgemeld THEN 'Ongewijzigd: de order is al verzonden of afgemeld; een bestaande buffer wordt niet gesplitst.'
+         WHEN l.buf_vast THEN 'Ongewijzigd: de buffer ligt al vast (geprint, gescand of verstuurd) en wordt niet gesplitst.'
+                              || CASE WHEN l.gemengd THEN ' Let op: in deze buffer staan verschillende soorten vertrek (deze order: ' || l.grp_t || ').' ELSE '' END
+         WHEN jsonb_array_length(coalesce(l.t->'overgeslagen','[]'::jsonb)) > 0
+           THEN 'Niet samengevoegd: buffer van ' || (SELECT string_agg(v, '; ') FROM jsonb_array_elements_text(l.t->'overgeslagen') v)
+                || ' ligt vast (geprint, gescand of verstuurd).'
+         WHEN l.t->>'soort' = 'uitgesloten' THEN 'Deze order is uitgesloten van combineren (handmatig uitgesloten van indeling).'
+         WHEN l.gemengd THEN 'Aparte kar: ' || l.grp_t || ' wordt niet samen gebufferd met orders met een ander soort vertrek (extern, eigen vervoer, klant haalt op).'
+         WHEN l.t->>'soort' = 'solo' THEN 'Volgens de huidige combineerregels krijgt deze order een eigen kar (' || coalesce(l.t->>'reason','onbekend') || ').'
+         WHEN l.grp <> 'extern' THEN 'Volgens de huidige combineerregels, alleen met orders met ' || l.grp_t || ' (' || coalesce(l.t->>'reason','onbekend') || ').'
+         ELSE 'Volgens de huidige combineerregels (' || coalesce(l.t->>'reason','onbekend') || ').' END
+  FROM l;
+END $function$;
+
+CREATE OR REPLACE FUNCTION public.logistics_install_check_218()
+RETURNS TABLE(punt text, ok boolean, uitleg text) LANGUAGE sql STABLE SECURITY DEFINER SET search_path TO 'public' AS $$
+  SELECT 'resolver eigen vervoer', position('logistics_own_transport_carrier' IN pg_get_functiondef('public.logistics_resolve_carrier_core(jsonb,boolean)'::regprocedure)) > 0,
+         'own_transport: vervoerder met soort eigen vervoer of geen; nooit favoriet/standaard'
+  UNION ALL SELECT 'bron eigen_vervoer toegestaan', position('eigen_vervoer' IN coalesce((SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conname = 'orders_carrier_source_check' LIMIT 1), 'eigen_vervoer')) > 0,
+         'carrier_source mag eigen_vervoer zijn'
+  UNION ALL SELECT 'externe keuze geweigerd', position('logistics_order_own_transport' IN pg_get_functiondef('public.logistics_set_order_carrier(uuid,uuid,uuid)'::regprocedure)) > 0,
+         'logistics_set_order_carrier weigert externe vervoerder bij eigen vervoer'
+  UNION ALL SELECT 'trigger own_transport', position('own_transport' IN pg_get_functiondef('public.logistics_orders_carrier_fill()'::regprocedure)) > 0,
+         'Wijziging van own_transport herberekent de vervoerder'
+  UNION ALL SELECT 'buffersleutel soort vertrek', position('transportGroup' IN pg_get_functiondef('public.logistics_buffer_payload(uuid)'::regprocedure)) > 0
+     AND EXISTS (SELECT 1 FROM pg_proc p JOIN pg_namespace s ON s.oid = p.pronamespace WHERE s.nspname = 'public'
+                  AND p.proname LIKE 'logistics_buffer_decision%' AND position('transport_group' IN pg_get_functiondef(p.oid)) > 0),
+         'Extern, eigen vervoer en klant haalt op nooit samen gebufferd'
+  UNION ALL SELECT 'verouderd bij gemengd vervoer', position('logistics_cart_vervoer_gemengd' IN pg_get_functiondef('public.logistics_cart_verouderd_core(uuid)'::regprocedure)) > 0,
+         'Kar met verschillende soorten vertrek: verouderd: opnieuw indelen'
+  UNION ALL SELECT 'guards', position('logistics_acc_guard' IN pg_get_functiondef('public.logistics_own_transport_carrier(jsonb,boolean)'::regprocedure)) > 0
+     AND position('logistics_acc_guard' IN pg_get_functiondef('public.logistics_order_transport_group(jsonb)'::regprocedure)) > 0,
+         'Aanroeper wordt intern gecontroleerd'
+$$;
+GRANT EXECUTE ON FUNCTION public.logistics_install_check_218() TO authenticated, service_role;

package/dist-lib/integrations/supabase/types.d.ts

@@ -35639,6 +35639,16 @@ export type Database = {
                 };
                 Returns: number;
             };
+            logistics_canon_ref: {
+                Args: {
+                    p_ref: string;
+                };
+                Returns: {
+                    pid: string;
+                    reden: string;
+                    tkey: string;
+                }[];
+            };
             logistics_capacity_day_check: {
                 Args: {
                     p_from?: string;
@@ -35646,6 +35656,20 @@ export type Database = {
                 };
                 Returns: Json;
             };
+            logistics_capacity_day_load: {
+                Args: {
+                    p_from: string;
+                    p_settings: Json;
+                    p_to: string;
+                    p_user: string;
+                };
+                Returns: {
+                    carts: number;
+                    d: string;
+                    required: number;
+                    zonder_kar: number;
+                }[];
+            };
             logistics_capacity_plan_day: {
                 Args: {
                     p_date: string;
@@ -36102,6 +36126,12 @@ export type Database = {
                 };
                 Returns: Json;
             };
+            logistics_cart_vervoer_gemengd: {
+                Args: {
+                    p_cart_id: string;
+                };
+                Returns: Json;
+            };
             logistics_cart_vulgraad_core: {
                 Args: {
                     p_cart_id: string;
@@ -37094,6 +37124,22 @@ export type Database = {
                     uitleg: string;
                 }[];
             };
+            logistics_install_check_217: {
+                Args: never;
+                Returns: {
+                    ok: boolean;
+                    punt: string;
+                    uitleg: string;
+                }[];
+            };
+            logistics_install_check_218: {
+                Args: never;
+                Returns: {
+                    ok: boolean;
+                    punt: string;
+                    uitleg: string;
+                }[];
+            };
             logistics_is_beheer: {
                 Args: never;
                 Returns: boolean;
@@ -37713,6 +37759,12 @@ export type Database = {
                     status: string;
                 }[];
             };
+            logistics_order_own_transport: {
+                Args: {
+                    p_custom_fields: Json;
+                };
+                Returns: boolean;
+            };
             logistics_order_pick_day: {
                 Args: {
                     p_order_ref: string;
@@ -37821,6 +37873,12 @@ export type Database = {
                     order_id: string;
                 }[];
             };
+            logistics_order_transport_group: {
+                Args: {
+                    p_order: Json;
+                };
+                Returns: string;
+            };
             logistics_order_unit_carts: {
                 Args: {
                     p_order_ids: string[];
@@ -37878,6 +37936,13 @@ export type Database = {
                 };
                 Returns: Json;
             };
+            logistics_own_transport_carrier: {
+                Args: {
+                    p_order: Json;
+                    p_skip_manual: boolean;
+                };
+                Returns: Json;
+            };
             logistics_own_transport_departure: {
                 Args: {
                     p_delivery_date: string;
@@ -44963,6 +45028,12 @@ export type Database = {
                 };
                 Returns: boolean;
             };
+            voorraad_orderregel_sleutel: {
+                Args: {
+                    p_ref: string;
+                };
+                Returns: string;
+            };
             voorraad_packing_from_floriday: {
                 Args: {
                     p_product_id: string;