@flowselections/logistiek-engine 1.0.185 → 1.0.187

package/db/schema/logistiek-engine.sql

@@ -4548,169 +4548,7 @@ EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR inva
   RAISE NOTICE 'logistiek-engine: functie public.logistics_allowed_load_carriers overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
 END $fsdo$;
 
-DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_apply_buffer_decision(p_order_id uuid)
- RETURNS uuid
- LANGUAGE plpgsql
- SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
-DECLARE
-  o public.orders%ROWTYPE;
-  cf jsonb; d jsonb; v_ref text; v_close timestamptz; v_key text;
-  v_buffer uuid; v_closed boolean; v_try int := 0; v_on_cart boolean;
-BEGIN
-  SELECT * INTO o FROM public.orders WHERE id = p_order_id;
-  IF NOT FOUND OR o.deleted_at IS NOT NULL THEN RETURN NULL; END IF;
-  cf := COALESCE(o.custom_fields, '{}'::jsonb);
-
-  IF public.logistics_order_buffer_excluded(o.id) THEN
-    IF o.buffer_id IS NOT NULL THEN
-      SELECT EXISTS (SELECT 1 FROM public.order_items oi
-                       JOIN logistics_active.order_cart_items ci ON ci.order_item_id = oi.id
-                       JOIN logistics_active.order_carts oc ON oc.id = ci.cart_id
-                      WHERE oi.order_id = o.id AND oc.buffer_id = o.buffer_id)
-        INTO v_on_cart;
-      IF NOT v_on_cart THEN
-        PERFORM set_config('logistics.buffer_writer', 'engine', true);
-        UPDATE public.orders SET buffer_id = NULL WHERE id = o.id;
-        BEGIN
-          INSERT INTO public.logistics_planner_trace(order_id, message)
-          VALUES (o.id, 'afgemeld; uit buffer gehaald');
-        EXCEPTION WHEN others THEN NULL; END;
-      END IF;
-    END IF;
-    RETURN NULL;
-  END IF;
-
-  d := public.logistics_buffer_decision(public.logistics_buffer_payload(o.id), NULL);
-
-  IF COALESCE((d ->> 'buffer')::boolean, false) IS NOT TRUE OR (d ->> 'bufferRef') IS NULL THEN
-    IF o.buffer_id IS NOT NULL THEN
-      UPDATE public.order_carts SET buffer_id = NULL WHERE order_id = o.id;
-      PERFORM set_config('logistics.buffer_writer', 'engine', true);
-      UPDATE public.orders SET buffer_id = NULL WHERE id = o.id;
-    END IF;
-    DELETE FROM public.order_buffers b
-     WHERE NOT EXISTS (SELECT 1 FROM public.orders x WHERE x.buffer_id = b.id)
-       AND NOT EXISTS (SELECT 1 FROM public.order_carts oc WHERE oc.buffer_id = b.id);
-    RETURN NULL;
-  END IF;
-
-  v_ref := d ->> 'bufferRef';
-  BEGIN v_close := NULLIF(d ->> 'bufferCloseAt', '')::timestamptz;
-  EXCEPTION WHEN others THEN v_close := NULL; END;
-
-  LOOP
-    v_key := CASE WHEN v_try = 0 THEN v_ref ELSE v_ref || '#' || v_try END;
-    SELECT id INTO v_buffer FROM public.order_buffers WHERE buffer_key = v_key;
-    IF v_buffer IS NULL THEN
-      INSERT INTO public.order_buffers (buffer_key, grouping_mode, pickup_date, pickup_location, customer_id, close_at)
-      VALUES (v_key, 'engine',
-        COALESCE(cf ->> 'pickup_moment', cf ->> 'pickup_date', o.delivery_date::text),
-        COALESCE(cf ->> 'delivery_location_gln', cf ->> 'delivery_location_id', cf ->> 'delivery_location'),
-        o.customer_id, v_close)
-      ON CONFLICT (buffer_key) DO UPDATE SET grouping_mode = EXCLUDED.grouping_mode
-      RETURNING id INTO v_buffer;
-      EXIT;
-    END IF;
-    IF o.buffer_id = v_buffer THEN EXIT; END IF;
-
-    -- 1.0.164: ook een buffer met een geprinte, gescande of verstuurde kar/order is dicht voor nieuwe orders.
-    v_closed := public.logistics_buffer_closed_for_join(v_buffer);
-
-    IF NOT COALESCE(v_closed, false) THEN
-      UPDATE public.order_buffers
-         SET close_at = LEAST(COALESCE(close_at, v_close), COALESCE(v_close, close_at)), updated_at = now()
-       WHERE id = v_buffer;
-      EXIT;
-    END IF;
-    UPDATE public.order_buffers SET closed_at = COALESCE(closed_at, now()), updated_at = now() WHERE id = v_buffer;
-    v_try := v_try + 1; v_buffer := NULL;
-    IF v_try > 50 THEN RAISE EXCEPTION 'Kan geen open orderbuffer vinden voor sleutel %', v_ref; END IF;
-  END LOOP;
-
-  IF o.buffer_id IS DISTINCT FROM v_buffer THEN
-    PERFORM set_config('logistics.buffer_writer', 'engine', true);
-    UPDATE public.orders SET buffer_id = v_buffer WHERE id = o.id;
-    DELETE FROM public.order_buffers b
-     WHERE NOT EXISTS (SELECT 1 FROM public.orders x WHERE x.buffer_id = b.id)
-       AND NOT EXISTS (SELECT 1 FROM public.order_carts oc WHERE oc.buffer_id = b.id);
-  END IF;
-  RETURN v_buffer;
-END;
-$function$
-$fsdef$;
-EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_apply_buffer_decision overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
-END $fsdo$;
-
-DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_apply_cart_swap(p_delete_ids uuid[], p_new_carts jsonb)
- RETURNS jsonb
- LANGUAGE plpgsql
- SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
-DECLARE
-  v_del uuid[] := COALESCE(p_delete_ids, ARRAY[]::uuid[]);
-  v_cart jsonb; v_row jsonb; v_id uuid; v_map jsonb := '[]'::jsonb;
-  v_jobs int := 0; v_carts int := 0; v_items int := 0;
-BEGIN
-  IF jsonb_typeof(COALESCE(p_new_carts, '[]'::jsonb)) <> 'array' THEN
-    RAISE EXCEPTION 'Nieuwe karren ontbreken of zijn ongeldig.';
-  END IF;
-
-  IF array_length(v_del, 1) IS NOT NULL THEN
-    UPDATE public.print_jobs
-       SET status = 'geannuleerd'::print_job_status,
-           foutmelding = 'Vervallen: kar verwijderd bij herindeling',
-           updated_at = now()
-     WHERE status IN ('wachtend'::print_job_status, 'bezig'::print_job_status)
-       AND (payload->>'cart_id') = ANY(SELECT id::text FROM unnest(v_del) AS id);
-    GET DIAGNOSTICS v_jobs = ROW_COUNT;
-    DELETE FROM public.pakbon_barcode_inhoud WHERE cart_id = ANY(SELECT id::text FROM unnest(v_del) AS id);
-    DELETE FROM public.order_cart_layer_positions WHERE cart_id = ANY(v_del);
-    DELETE FROM public.order_cart_items WHERE cart_id = ANY(v_del);
-    DELETE FROM public.order_carts
-     WHERE id = ANY(v_del)
-       AND COALESCE(pickup_locked, false) IS FALSE;
-    GET DIAGNOSTICS v_carts = ROW_COUNT;
-  END IF;
-
-  FOR v_cart IN SELECT value FROM jsonb_array_elements(COALESCE(p_new_carts, '[]'::jsonb)) LOOP
-    v_row := v_cart->'row';
-    v_id := gen_random_uuid();
-    INSERT INTO public.order_carts (id, order_id, buffer_id, cart_number, total_carts, is_auto, is_complete, source,
-      occupancy_pct, total_layers_used, carrier_type, carrier_type_id, max_layers, weight_kg, algorithm_version, layout_method)
-    SELECT v_id, r.order_id, r.buffer_id, r.cart_number, r.total_carts, COALESCE(r.is_auto, true), COALESCE(r.is_complete, false),
-           COALESCE(r.source, 'auto'), COALESCE(r.occupancy_pct, 0), COALESCE(r.total_layers_used, 0),
-           COALESCE(r.carrier_type, 'trolley'), r.carrier_type_id, r.max_layers, r.weight_kg, COALESCE(r.algorithm_version, 1), r.layout_method
-      FROM jsonb_to_record(v_row) AS r(order_id uuid, buffer_id uuid, cart_number integer, total_carts integer, is_auto boolean,
-           is_complete boolean, source text, occupancy_pct numeric, total_layers_used numeric, carrier_type text, carrier_type_id uuid,
-           max_layers integer, weight_kg numeric, algorithm_version integer, layout_method text);
-
-    INSERT INTO public.order_cart_items (cart_id, order_item_id, product_id, product_name, crates, boxes, weight_kg,
-      plants_per_crate, crates_per_layer, layers_per_cart, layer_fraction, layer_share_pct, layer_index, crates_in_layer, components)
-    SELECT v_id, i.order_item_id, i.product_id, i.product_name, i.crates, i.boxes, i.weight_kg,
-           COALESCE(i.plants_per_crate, 1), COALESCE(i.crates_per_layer, 1), COALESCE(i.layers_per_cart, 1),
-           COALESCE(i.layer_fraction, 0), COALESCE(i.layer_share_pct, 0), i.layer_index, i.crates_in_layer,
-           CASE WHEN jsonb_typeof(i.components) = 'array' THEN i.components END
-      FROM jsonb_to_recordset(COALESCE(v_cart->'items', '[]'::jsonb)) AS i(order_item_id uuid, product_id uuid, product_name text,
-           crates integer, boxes integer, weight_kg numeric, plants_per_crate integer, crates_per_layer integer, layers_per_cart integer,
-           layer_fraction numeric, layer_share_pct numeric, layer_index integer, crates_in_layer integer, components jsonb);
-    v_items := v_items + jsonb_array_length(COALESCE(v_cart->'items', '[]'::jsonb));
 
-    v_map := v_map || jsonb_build_object('planIndex', (v_cart->>'planIndex')::integer, 'id', v_id);
-  END LOOP;
-
-  RETURN jsonb_build_object('karren', v_map, 'verwijderd', v_carts, 'printopdrachtenGeannuleerd', v_jobs, 'regels', v_items);
-END;
-$function$
-$fsdef$;
-EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_apply_cart_swap overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
-END $fsdo$;
 
 DO $fsdo$ BEGIN
   EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_apply_document_layouts()
@@ -5600,80 +5438,6 @@ EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR inva
   RAISE NOTICE 'logistiek-engine: functie public.logistics_blocked_overview overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
 END $fsdo$;
 
-DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_brief_transport(p_order_id uuid, p_cart_id uuid DEFAULT NULL::uuid)
- RETURNS jsonb
- LANGUAGE plpgsql
- STABLE SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
-DECLARE
-  o record; v_carrier_id uuid; v_bron text; ca public.carriers%ROWTYPE;
-  v_naam text; v_code text; v_date date; v_time time; n int;
-  v_wens text; onbekend text[] := '{}'::text[]; uit jsonb := '{}'::jsonb;
-BEGIN
-  SELECT id, custom_fields, floriday_sales_order_id INTO o FROM public.orders WHERE id = p_order_id AND deleted_at IS NULL;
-  IF o.id IS NULL THEN
-    RETURN jsonb_build_object('onbekend', jsonb_build_array('order'));
-  END IF;
-
-  IF coalesce(o.custom_fields->>'carrier','') ~* '^[0-9a-f-]{36}$' THEN
-    v_carrier_id := (o.custom_fields->>'carrier')::uuid; v_bron := 'order';
-  ELSIF coalesce(o.custom_fields->>'delivery_location','') ~* '^[0-9a-f-]{36}$' THEN
-    SELECT carrier_id INTO v_carrier_id FROM public.customer_delivery_locations
-     WHERE id = (o.custom_fields->>'delivery_location')::uuid;
-    v_bron := 'afleverlocatie';
-  END IF;
-  IF v_carrier_id IS NOT NULL THEN
-    SELECT * INTO ca FROM public.carriers WHERE id = v_carrier_id;
-  END IF;
-
-  IF ca.id IS NOT NULL AND nullif(trim(ca.name),'') IS NOT NULL THEN
-    uit := uit || jsonb_build_object('vervoerder', jsonb_build_object('naam', ca.name), 'vervoerder_bron', v_bron);
-  ELSE
-    SELECT count(*), min(fc.name), min(nullif(fc.gln_code,'')) INTO n, v_naam, v_code
-      FROM public.floriday_delivery_orders_cache d
-      JOIN public.floriday_carriers_cache fc ON fc.organization_id::text = d.data->>'carrierOrganizationId'
-     WHERE o.floriday_sales_order_id IS NOT NULL
-       AND d.data::text LIKE '%' || o.floriday_sales_order_id::text || '%'
-       AND coalesce(d.is_deleted,false) = false;
-    IF n = 1 AND nullif(trim(v_naam),'') IS NOT NULL THEN
-      uit := uit || jsonb_build_object('vervoerder', jsonb_build_object('naam', v_naam) ||
-             CASE WHEN v_code IS NOT NULL THEN jsonb_build_object('code', v_code) ELSE '{}'::jsonb END,
-             'vervoerder_bron', 'floriday');
-    ELSE
-      onbekend := array_append(onbekend, CASE WHEN n > 1 THEN 'vervoerder_niet_eenduidig' ELSE 'vervoerder' END);
-    END IF;
-  END IF;
-
-  SELECT pick_date INTO v_date FROM public.logistics_order_pick_day WHERE order_id = p_order_id;
-  IF v_date IS NULL OR ca.id IS NULL OR jsonb_typeof(ca.pickup_moments) IS DISTINCT FROM 'array' THEN
-    onbekend := array_append(onbekend, 'ophaalmoment');
-  ELSIF ca.pickup_weekdays IS NOT NULL AND array_length(ca.pickup_weekdays,1) > 0
-        AND NOT (extract(isodow FROM v_date)::int = ANY (ca.pickup_weekdays)) THEN
-    onbekend := array_append(onbekend, 'ophaalmoment');
-  ELSE
-    v_wens := nullif(o.custom_fields->>'pickup_moment','');
-    SELECT count(*), min(nullif(m->>'pickup_time','')::time) INTO n, v_time
-      FROM jsonb_array_elements(ca.pickup_moments) m
-     WHERE nullif(m->>'pickup_time','') IS NOT NULL
-       AND coalesce(nullif(m->>'pickup_days',''),'0') = '0'
-       AND (v_wens IS NULL OR left(m->>'pickup_time',5) = left(v_wens,5));
-    IF n = 1 THEN
-      uit := uit || jsonb_build_object('ophaalmoment',
-        to_char(((v_date + v_time) AT TIME ZONE public.logistics_tz()) AT TIME ZONE 'UTC', 'YYYY-MM-DD"T"HH24:MI:SS"Z"'));
-    ELSE
-      onbekend := array_append(onbekend, CASE WHEN n > 1 THEN 'ophaalmoment_niet_eenduidig' ELSE 'ophaalmoment' END);
-    END IF;
-  END IF;
-
-  RETURN uit || jsonb_build_object('onbekend', to_jsonb(onbekend));
-END;
-$function$
-$fsdef$;
-EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_brief_transport overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
-END $fsdo$;
 
 DO $fsdo$ BEGIN
   EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_buffer_closed_for_join(p_buffer uuid)
@@ -6240,36 +6004,6 @@ EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR inva
   RAISE NOTICE 'logistiek-engine: functie public.logistics_buffer_open_key overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
 END $fsdo$;
 
-DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_buffer_payload(p_order_id uuid)
- RETURNS jsonb
- LANGUAGE sql
- STABLE SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
-  SELECT jsonb_build_object(
-      'orderRef', COALESCE(o.order_number, o.id::text),
-      'checkinAt', COALESCE(cf ->> 'checkin_at', cf ->> 'checkin_moment', cf ->> 'pickup_moment', cf ->> 'pickup_datetime'),
-      'pickupAt', COALESCE(cf ->> 'pickup_datetime', cf ->> 'pickup_moment', cf ->> 'checkin_at'),
-      'customerRef', o.customer_id::text,
-      'floridayCustomerRef', COALESCE(cf ->> 'floriday_customer_id', cf ->> 'floriday_customer_ref'),
-      'floridaySalesOrderRef', COALESCE(o.floriday_sales_order_id::text, cf ->> 'floriday_sales_order_id'),
-      'bvoCustomerRef', COALESCE(cf ->> 'bvo_customer_ref', cf ->> 'bvo_customer_id'),
-      'deliveryLocationRef', COALESCE(cf ->> 'delivery_location_gln', cf ->> 'delivery_location_id', cf ->> 'delivery_location'),
-      'deliveryDate', o.delivery_date::text,
-      'carrierRef', COALESCE(cf ->> 'carrier_id', cf ->> 'carrier'),
-      'loadCarrierType', COALESCE(cf ->> 'load_carrier_type', 'trolley'),
-      'orderType', COALESCE(cf ->> 'order_type', o.order_source, 'standaard'),
-      'isReservation', COALESCE(o.is_reservation, false)
-    )
-  FROM public.orders o
-  CROSS JOIN LATERAL (SELECT COALESCE(o.custom_fields, '{}'::jsonb) AS cf) x
-  WHERE o.id = p_order_id;
-$function$
-$fsdef$;
-EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_buffer_payload overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
-END $fsdo$;
 
 DO $fsdo$ BEGIN
   EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_buffer_simulate(p_orders jsonb DEFAULT '[]'::jsonb, p_strategy_id uuid DEFAULT NULL::uuid)
@@ -6756,45 +6490,6 @@ EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR inva
   RAISE NOTICE 'logistiek-engine: functie public.logistics_capacity_plan_day overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
 END $fsdo$;
 
-DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_carrier_for_location(p_location text, p_customer_id uuid)
- RETURNS uuid
- LANGUAGE plpgsql
- STABLE SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
-DECLARE v_raw text := nullif(btrim(coalesce(p_location,'')),''); v_lid uuid := public.logistics_try_uuid(v_raw);
-  dl_country text; dl_province text; dl_city text; c_country text; c_city text; v_id uuid; v_country text; v_city text; v_prov text;
-BEGIN
-  IF v_raw IS NOT NULL THEN
-    SELECT l.country, l.province, l.city INTO dl_country, dl_province, dl_city FROM public.customer_delivery_locations l
-     WHERE (v_lid IS NOT NULL AND l.id = v_lid) OR l.gln = v_raw
-     ORDER BY (v_lid IS NOT NULL AND l.id = v_lid) DESC
-     LIMIT 1;
-  END IF;
-  IF p_customer_id IS NOT NULL THEN
-    SELECT cu.country, cu.city INTO c_country, c_city FROM public.customers cu WHERE cu.id = p_customer_id;
-  END IF;
-  v_country := public.afh_normalize_country(coalesce(dl_country, c_country));
-  v_city := public.afh_city_code(v_country, coalesce(dl_city, c_city));
-  v_prov := public.afh_normalize_nl_province(dl_province);
-  SELECT ca.id INTO v_id FROM public.carriers ca
-   WHERE nullif(trim(ca.email),'') IS NOT NULL
-     AND ((v_country = ANY(ca.service_countries))
-       OR (v_prov = ANY(ca.service_provinces))
-       OR (v_city = ANY(ca.service_cities))
-       OR ca.is_default)
-   ORDER BY CASE WHEN ca.is_default AND NOT (
-              (v_country = ANY(ca.service_countries))
-              OR (v_prov = ANY(ca.service_provinces))
-              OR (v_city = ANY(ca.service_cities))) THEN 1 ELSE 0 END, ca.sort_order, ca.id
-   LIMIT 1;
-  RETURN v_id;
-END $function$
-$fsdef$;
-EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_carrier_for_location overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
-END $fsdo$;
 
 DO $fsdo$ BEGIN
   EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_carrier_minutes(p_carrier text, p_settings jsonb)
@@ -7873,49 +7568,11 @@ EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR inva
   RAISE NOTICE 'logistiek-engine: functie public.logistics_cart_scanned overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
 END $fsdo$;
 
+
 DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_cart_seq(p_order_uuid uuid DEFAULT NULL::uuid)
- RETURNS TABLE(order_uuid uuid, cart_id uuid, cart_index integer, cart_seq integer, cart_number text, cart_total integer)
- LANGUAGE sql
- STABLE SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
-  WITH deelname_ruw AS (
-    SELECT oc.id AS cart_id, oc.cart_number AS cart_index, oc.order_id AS order_uuid, oc.created_at
-    FROM public.order_carts oc
-    WHERE oc.order_id IS NOT NULL AND (p_order_uuid IS NULL OR oc.order_id = p_order_uuid)
-    UNION
-    SELECT oc.id, oc.cart_number, oi.order_id, oc.created_at
-    FROM public.order_carts oc
-    JOIN public.order_cart_items oci ON oci.cart_id = oc.id
-    JOIN logistics_active.order_items oi ON oi.id = oci.order_item_id
-    WHERE oc.order_id IS NULL AND oi.order_id IS NOT NULL AND (p_order_uuid IS NULL OR oi.order_id = p_order_uuid)
-  ),
-  deelname AS (
-    SELECT DISTINCT ON (d.order_uuid, d.cart_index) d.*
-    FROM deelname_ruw d
-    ORDER BY d.order_uuid, d.cart_index, d.created_at DESC, d.cart_id
-  ),
-  genummerd AS (
-    SELECT d.order_uuid, d.cart_id, d.cart_index,
-      dense_rank() OVER (PARTITION BY d.order_uuid ORDER BY d.cart_index)::int AS cart_seq,
-      count(*) OVER (PARTITION BY d.order_uuid)::int AS cart_total
-    FROM deelname d
-  )
-  SELECT g.order_uuid, g.cart_id, g.cart_index, g.cart_seq,
-    COALESCE(cn.cart_number, g.cart_seq::text) AS cart_number, g.cart_total
-  FROM genummerd g
-  LEFT JOIN public.cart_numbers cn ON cn.order_id = g.order_uuid::text AND cn.cart_index = g.cart_index;
-$function$
-$fsdef$;
-EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_cart_seq overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
-END $fsdo$;
-
-DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_cart_slip_plan(p_order_id uuid)
- RETURNS jsonb
- LANGUAGE plpgsql
+  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_cart_slip_plan(p_order_id uuid)
+ RETURNS jsonb
+ LANGUAGE plpgsql
  STABLE SECURITY DEFINER
  SET search_path TO 'public'
 AS $function$
@@ -9684,111 +9341,6 @@ EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR inva
   RAISE NOTICE 'logistiek-engine: functie public.logistics_document_layout overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
 END $fsdo$;
 
-DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_document_layout_v2(_document_code text, _is_partial boolean DEFAULT false)
- RETURNS jsonb
- LANGUAGE plpgsql
- STABLE SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
-DECLARE
-  v_types public.doc_layout_type[];
-  v_code text;
-  v_keys text[];
-  v_key text;
-  v_fields jsonb;
-  v_chosen uuid;
-  v_used_key text;
-  v_layout public.document_layouts%ROWTYPE;
-BEGIN
-  v_code := lower(btrim(coalesce(_document_code, '')));
-  v_types := public.logistics_document_type_map(v_code);
-
-  -- Geordende sleutellijst: eigen instelling eerst, daarna de terugval.
-  -- Pakbon kent twee varianten: een volle kar en een deelorder (geen volle kar).
-  v_keys := CASE
-    WHEN v_code LIKE '%pakbon%' AND COALESCE(_is_partial, false)
-      THEN ARRAY['packing_slip_partial_layout', 'packing_slip_layout']
-    WHEN v_code LIKE '%pakbon%' THEN ARRAY['packing_slip_layout']
-    WHEN v_code LIKE '%sticker%' OR v_code LIKE '%etiket%' THEN ARRAY['sticker_layout']
-    WHEN v_code LIKE '%afleverbrief%' OR v_code LIKE '%afleverbon%'
-      THEN ARRAY['delivery_note_layout', 'shipping_note_layout']
-    WHEN v_code LIKE '%veilingbrief%' OR v_code LIKE '%veilingbon%'
-      THEN ARRAY['auction_note_layout', 'shipping_note_layout']
-    WHEN v_code LIKE '%verzendbrief%' OR v_code LIKE '%transportbrief%'
-      OR v_code LIKE '%verzendlabel%' THEN ARRAY['shipping_note_layout']
-    WHEN v_code LIKE '%productiebon%' OR v_code LIKE '%productielijst%'
-      THEN ARRAY['production_note_layout']
-    ELSE NULL
-  END;
-
-  IF v_keys IS NOT NULL THEN
-    FOREACH v_key IN ARRAY v_keys LOOP
-      SELECT settings->'pickstations'->'fields'
-        INTO v_fields
-        FROM public.logistics_rule_configs
-       WHERE nullif(settings->'pickstations'->'fields'->>v_key, '') IS NOT NULL
-       ORDER BY is_active DESC, (status = 'actief') DESC, updated_at DESC
-       LIMIT 1;
-
-      BEGIN
-        v_chosen := nullif(v_fields->>v_key, '')::uuid;
-      EXCEPTION WHEN invalid_text_representation THEN
-        v_chosen := NULL;
-      END;
-
-      IF v_chosen IS NOT NULL THEN
-        v_used_key := v_key;
-        EXIT;
-      END IF;
-    END LOOP;
-  END IF;
-
-  IF v_chosen IS NOT NULL THEN
-    SELECT * INTO v_layout
-      FROM public.document_layouts
-     WHERE id = v_chosen
-       AND actief IS TRUE;
-    IF v_layout.id IS NULL THEN
-      v_used_key := NULL;
-    END IF;
-  END IF;
-
-  IF v_layout.id IS NULL AND array_length(v_types, 1) IS NOT NULL THEN
-    SELECT * INTO v_layout
-      FROM public.document_layouts
-     WHERE actief IS TRUE
-       AND documenttype = ANY (v_types)
-     ORDER BY array_position(v_types, documenttype), is_standaard DESC, updated_at DESC
-     LIMIT 1;
-  END IF;
-
-  IF v_layout.id IS NULL THEN
-    RETURN NULL;
-  END IF;
-
-  RETURN jsonb_build_object(
-    'layoutId', v_layout.id,
-    'layoutName', v_layout.naam,
-    'layoutVersion', v_layout.huidige_versie,
-    'layoutDocumentType', v_layout.documenttype::text,
-    'layoutSettingKey', v_used_key,
-    'layoutVariant', CASE WHEN COALESCE(_is_partial, false) THEN 'partial_order' ELSE 'full_cart' END,
-    'layoutFallbackUsed', (v_used_key IS NOT NULL AND v_keys IS NOT NULL AND v_used_key <> v_keys[1]),
-    'layout_id', v_layout.id,
-    'layout_name', v_layout.naam,
-    'layout_version', v_layout.huidige_versie,
-    'layout_document_type', v_layout.documenttype::text,
-    'layout_setting_key', v_used_key,
-    'layout_variant', CASE WHEN COALESCE(_is_partial, false) THEN 'partial_order' ELSE 'full_cart' END,
-    'layout_fallback_used', (v_used_key IS NOT NULL AND v_keys IS NOT NULL AND v_used_key <> v_keys[1])
-  );
-END;
-$function$
-$fsdef$;
-EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_document_layout_v2 overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
-END $fsdo$;
 
 DO $fsdo$ BEGIN
   EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_document_station(_document_code text)
@@ -12310,30 +11862,6 @@ EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR inva
   RAISE NOTICE 'logistiek-engine: functie public.logistics_order_buffer_excluded overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
 END $fsdo$;
 
-DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_order_carrier_id(p_order_id uuid)
- RETURNS uuid
- LANGUAGE plpgsql
- STABLE SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
-DECLARE v_own uuid; v_id uuid; o record;
-BEGIN
-  SELECT ord.custom_fields cf, ord.customer_id INTO o FROM public.orders ord WHERE ord.id = p_order_id;
-  IF NOT FOUND THEN RETURN NULL; END IF;
-  v_own := public.logistics_try_uuid(o.cf->>'carrier');
-  IF v_own IS NOT NULL THEN
-    SELECT id INTO v_id FROM public.carriers WHERE id = v_own;
-    IF v_id IS NOT NULL THEN RETURN v_id; END IF;
-  END IF;
-  RETURN public.logistics_carrier_for_location(
-    coalesce(nullif(o.cf->>'delivery_location',''), nullif(o.cf->>'delivery_location_id',''), nullif(o.cf->>'delivery_location_gln','')),
-    o.customer_id);
-END $function$
-$fsdef$;
-EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_order_carrier_id overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
-END $fsdo$;
 
 DO $fsdo$ BEGIN
   EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_order_cart_approval(_order_ref text)
@@ -12548,48 +12076,6 @@ EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR inva
   RAISE NOTICE 'logistiek-engine: functie public.logistics_order_definitively_blocked overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
 END $fsdo$;
 
-DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_order_departure(p_order_id uuid)
- RETURNS jsonb
- LANGUAGE plpgsql
- STABLE SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
-DECLARE o record; v jsonb; v_own jsonb; v_txt text; v_at timestamptz;
-BEGIN
-  IF public.logistics_tz() IS NULL THEN
-    RETURN jsonb_build_object('ok', false, 'reason', 'De tijdzone van de vestiging ontbreekt. Stel die in bij Werktijden.');
-  END IF;
-  SELECT id, created_at, delivery_date, custom_fields INTO o FROM public.orders WHERE id = p_order_id;
-  IF NOT FOUND OR coalesce(o.delivery_date,'') !~ '^\d{4}-\d{2}-\d{2}' THEN
-    RETURN jsonb_build_object('ok', false, 'reason', 'De leverdatum van de order is onbekend.');
-  END IF;
-
-  v_own := CASE WHEN jsonb_typeof(o.custom_fields->'own_transport') = 'object' THEN o.custom_fields->'own_transport' END;
-  IF v_own IS NOT NULL THEN
-    v_txt := nullif(btrim(coalesce(v_own->>'pickup_at', '')), '');
-    IF v_txt IS NOT NULL THEN
-      IF v_txt !~ '(Z|[+-]\d{2}(:?\d{2})?)$' THEN
-        RETURN jsonb_build_object('ok', false, 'ownTransport', true,
-          'reason', 'De ophaaltijd bij eigen vervoer mist een tijdzone.');
-      END IF;
-      BEGIN
-        v_at := v_txt::timestamptz;
-      EXCEPTION WHEN OTHERS THEN
-        RETURN jsonb_build_object('ok', false, 'ownTransport', true,
-          'reason', 'De ophaaltijd bij eigen vervoer is geen geldige tijd.');
-      END;
-    END IF;
-    RETURN public.logistics_own_transport_departure(left(o.delivery_date,10)::date, v_at);
-  END IF;
-
-  v := public.logistics_departure_calc(public.logistics_order_carrier_id(p_order_id), left(o.delivery_date,10)::date, o.created_at, NULL);
-  RETURN v - 'moments';
-END $function$
-$fsdef$;
-EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_order_departure overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
-END $fsdo$;
 
 DO $fsdo$ BEGIN
   EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_order_departure_list(p_order_ids uuid[])
@@ -13866,70 +13352,6 @@ EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR inva
   RAISE NOTICE 'logistiek-engine: functie public.logistics_own_transport_departure overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
 END $fsdo$;
 
-DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_packing_autofix(p_limit integer DEFAULT 100)
- RETURNS integer
- LANGUAGE plpgsql
- SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
-DECLARE
-  r record;
-  v_reden text;
-  v_aantal integer := 0;
-BEGIN
-  FOR r IN
-    SELECT d.*
-      FROM public.logistics_packing_deviations d
-     WHERE d.resolved_at IS NULL
-       AND d.scope = 'order_line'
-       AND d.needs_human = false
-       AND d.order_id IS NOT NULL
-       AND d.order_item_id IS NOT NULL
-     ORDER BY d.first_seen_at
-     LIMIT GREATEST(1, LEAST(p_limit, 500))
-  LOOP
-    v_reden := public.logistics_packing_block_reason(r.order_id, r.order_item_id);
-
-    IF v_reden IS NOT NULL THEN
-      UPDATE public.logistics_packing_deviations
-         SET needs_human = true, human_reason = v_reden
-       WHERE id = r.id;
-      CONTINUE;
-    END IF;
-
-    UPDATE public.order_items oi
-       SET plants_per_crate = COALESCE(
-             (r.floriday_packing->>'pieces_per_package')::int, oi.plants_per_crate),
-           crates_per_layer = COALESCE(
-             (r.floriday_packing->>'packages_per_layer')::int, oi.crates_per_layer),
-           layers_per_cart = COALESCE(
-             (r.floriday_packing->>'layers_per_load_carrier')::int, oi.layers_per_cart)
-     WHERE oi.id = r.order_item_id
-       AND oi.packing_locked_at IS NULL;
-
-    IF FOUND THEN
-      v_aantal := v_aantal + 1;
-      UPDATE public.logistics_packing_deviations
-         SET auto_fixed_at = now(),
-             resolved_at = now(),
-             human_reason = 'automatisch bijgewerkt naar de Floriday-stand'
-       WHERE id = r.id;
-
-      PERFORM public.logistics_trace_event(
-        r.order_id, 'stap:belading_synchronisatie', 'ok',
-        'belading bijgewerkt naar de Floriday-stand'
-      );
-    END IF;
-  END LOOP;
-
-  RETURN v_aantal;
-END;
-$function$
-$fsdef$;
-EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_packing_autofix overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
-END $fsdo$;
 
 DO $fsdo$ BEGIN
   EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_packing_block_reason(p_order_id uuid, p_order_item_id uuid)
@@ -17241,346 +16663,41 @@ EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR inva
   RAISE NOTICE 'logistiek-engine: functie public.logistics_recalc_tick_kick overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
 END $fsdo$;
 
+
+
 DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_recompute_reserved_targeted(p_product_id uuid)
- RETURNS jsonb
+  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_refresh_pick_queue_status(p_ref text)
+ RETURNS integer
  LANGUAGE plpgsql
  SECURITY DEFINER
  SET search_path TO 'public'
 AS $function$
-DECLARE
-  v_t0 timestamptz := clock_timestamp();
-  v_max_lines constant integer := 500;
-  v_max_keys constant integer := 200;
-  v_trace_ms constant numeric := 500;
-  v_nkeys integer; v_nkeys_prev integer := -1; v_nlines integer := 0; v_changed integer := 0; v_ms numeric;
-  oi_rec record; part record; member_rec record;
-  v_key text; v_last_key text; v_remaining numeric; v_available numeric; v_take numeric; v_err text;
-  v_skipped jsonb := '[]'::jsonb; v_skipped_qty numeric := 0;
-  v_struct jsonb := '[]'::jsonb; v_struct_qty numeric := 0;
-  v_freeze boolean := public.logistics_plan_setting('verdeling_bevriezen_actief', 0) = 1;
-  v_frozen_ids uuid[]; v_line_ids uuid[];
-BEGIN
-  IF p_product_id IS NULL THEN RETURN jsonb_build_object('status', 'geen_product'); END IF;
-  IF current_setting('app.recomputing_reserved', true) = 'on' THEN RETURN jsonb_build_object('status', 'al_bezig'); END IF;
-  PERFORM set_config('app.recomputing_reserved', 'on', true);
-
-  DROP TABLE IF EXISTS _rt_open;
-  DROP TABLE IF EXISTS _rt_pexp;
-  DROP TABLE IF EXISTS _rt_gm;
-  DROP TABLE IF EXISTS _rt_raw;
-  DROP TABLE IF EXISTS _rt_pkeys;
-  DROP TABLE IF EXISTS _rt_keys;
-  DROP TABLE IF EXISTS _rt_lines;
-  DROP TABLE IF EXISTS _rt_demand;
-  DROP TABLE IF EXISTS _rt_alloc;
-  DROP TABLE IF EXISTS _rt_frozen;
-  CREATE TEMP TABLE _rt_open (order_item_id uuid PRIMARY KEY, product_id uuid, qty numeric, created_at timestamptz, order_id uuid) ON COMMIT DROP;
-  CREATE TEMP TABLE _rt_pexp (product_id uuid, ord bigint, kind text, ref text, qty numeric, note text) ON COMMIT DROP;
-  CREATE TEMP TABLE _rt_gm (group_id uuid, raw_key text, canon_key text, ord bigint) ON COMMIT DROP;
-  CREATE TEMP TABLE _rt_raw (raw_key text PRIMARY KEY, canon_key text) ON COMMIT DROP;
-  CREATE TEMP TABLE _rt_pkeys (product_id uuid, canon_key text) ON COMMIT DROP;
-  CREATE TEMP TABLE _rt_keys (canon_key text PRIMARY KEY) ON COMMIT DROP;
-  CREATE TEMP TABLE _rt_lines (order_item_id uuid PRIMARY KEY) ON COMMIT DROP;
-  CREATE TEMP TABLE _rt_demand (trade_item_key text PRIMARY KEY, qty numeric NOT NULL DEFAULT 0) ON COMMIT DROP;
-  CREATE TEMP TABLE _rt_alloc (order_item_id uuid, trade_item_key text, qty numeric, source text, group_id uuid) ON COMMIT DROP;
-  CREATE TEMP TABLE _rt_frozen (order_item_id uuid PRIMARY KEY) ON COMMIT DROP;
-
-  INSERT INTO _rt_open
-  SELECT oi.id, oi.product_id, COALESCE(oi.quantity, 0)::numeric, o.created_at, oi.order_id
-    FROM logistics_active.order_items oi
-    JOIN public.orders o ON o.id = oi.order_id
-   WHERE o.status = 'Nog te picken' AND NOT public.logistics_reserved_order_excluded(o.id)
-     AND COALESCE(oi.quantity, 0) > 0
-     AND oi.product_id IS NOT NULL
-     AND NOT EXISTS (SELECT 1 FROM public.stock_mutation_log sml WHERE sml.order_item_id = oi.id AND sml.mutation_type = 'consumption');
-  -- Groepsregel naast eigen ledenregels: nooit reserveren.
-  DELETE FROM _rt_open o WHERE o.order_item_id IN (SELECT d.order_item_id FROM public.logistics_double_group_lines(NULL) d);
-
-  INSERT INTO _rt_pexp (product_id, ord, kind, ref, qty, note)
-  SELECT d.pid, e.ord, e.kind, e.ref, e.qty, e.note
-    FROM (SELECT DISTINCT product_id AS pid FROM _rt_open UNION SELECT p_product_id) d,
-         LATERAL public.logistics_expand_line(d.pid, 1) WITH ORDINALITY AS e(kind, ref, qty, note, ord);
-
-  INSERT INTO _rt_gm (group_id, raw_key, ord)
-  SELECT g.gid, m.raw_key, m.ord
-    FROM (SELECT DISTINCT ref::uuid AS gid FROM _rt_pexp WHERE kind = 'group') g,
-         LATERAL (
-           SELECT public.resolve_group_member_stock_key(pgi.trade_item_id) AS raw_key,
-                  row_number() OVER (ORDER BY pgi.sort_order ASC NULLS LAST, pgi.created_at ASC, pgi.id ASC) AS ord
-             FROM public.product_group_items pgi
-            WHERE pgi.product_group_id = g.gid) m
-   WHERE m.raw_key IS NOT NULL
-     AND m.raw_key NOT LIKE 'group:%';
-
-  INSERT INTO _rt_raw (raw_key, canon_key)
-  SELECT x.k, public.logistics_reserved_key(x.k)
-    FROM (SELECT ref AS k FROM _rt_pexp WHERE kind = 'item' UNION SELECT raw_key FROM _rt_gm) x;
-  UPDATE _rt_gm g SET canon_key = r.canon_key FROM _rt_raw r WHERE r.raw_key = g.raw_key;
-
-  INSERT INTO _rt_pkeys (product_id, canon_key)
-  SELECT DISTINCT e.product_id, r.canon_key
-    FROM _rt_pexp e JOIN _rt_raw r ON r.raw_key = e.ref
-   WHERE e.kind = 'item' AND r.canon_key IS NOT NULL
-  UNION
-  SELECT DISTINCT e.product_id, g.canon_key
-    FROM _rt_pexp e JOIN _rt_gm g ON g.group_id = e.ref::uuid
-   WHERE e.kind = 'group' AND g.canon_key IS NOT NULL;
-
-  INSERT INTO _rt_keys SELECT DISTINCT canon_key FROM _rt_pkeys WHERE product_id = p_product_id ON CONFLICT DO NOTHING;
-  LOOP
-    SELECT count(*) INTO v_nkeys FROM _rt_keys;
-    EXIT WHEN v_nkeys = v_nkeys_prev;
-    v_nkeys_prev := v_nkeys;
-    INSERT INTO _rt_lines
-    SELECT o.order_item_id FROM _rt_open o
-     WHERE EXISTS (SELECT 1 FROM _rt_pkeys pk JOIN _rt_keys k ON k.canon_key = pk.canon_key
-                    WHERE pk.product_id = o.product_id)
-    ON CONFLICT DO NOTHING;
-    INSERT INTO _rt_keys
-    SELECT DISTINCT pk.canon_key FROM _rt_pkeys pk
-      JOIN _rt_open o ON o.product_id = pk.product_id
-      JOIN _rt_lines l ON l.order_item_id = o.order_item_id
-    ON CONFLICT DO NOTHING;
-    SELECT count(*) INTO v_nlines FROM _rt_lines;
-    IF v_nlines > v_max_lines OR (SELECT count(*) FROM _rt_keys) > v_max_keys THEN
-      PERFORM set_config('app.recomputing_reserved', 'off', true);
-      PERFORM public.recompute_all_reserved_stock();
-      v_ms := round(extract(epoch FROM clock_timestamp() - v_t0) * 1000, 1);
-      PERFORM public.logistics_trace(jsonb_build_object(
-        'phase', 'reservering', 'step', 'reservering herberekenen', 'status', 'waarschuwing',
-        'actor', 'logistics_recompute_reserved_targeted', 'errorClass', 'omvang',
-        'reason', 'Gerichte herberekening te groot; volledige herberekening uitgevoerd.',
-        'values', jsonb_build_object('product_id', p_product_id, 'regels', v_nlines,
-                                     'sleutels', (SELECT count(*) FROM _rt_keys), 'duur_ms', v_ms)));
-      RETURN jsonb_build_object('status', 'volledig', 'regels', v_nlines, 'duur_ms', v_ms);
-    END IF;
-  END LOOP;
-
-  -- Bevroren regels eerst, naar rato van het huidige aantal.
-  IF v_freeze THEN
-    INSERT INTO _rt_frozen
-    SELECT o.order_item_id FROM _rt_open o JOIN _rt_lines l ON l.order_item_id = o.order_item_id
-     WHERE EXISTS (SELECT 1 FROM public.logistics_reservation_allocations a WHERE a.order_item_id = o.order_item_id AND a.source <> 'error')
-       AND public.logistics_allocation_frozen(o.order_id)
-    ON CONFLICT DO NOTHING;
-    INSERT INTO _rt_alloc
-    SELECT f.order_item_id, s.trade_item_key, s.qty, s.source, s.group_id
-      FROM _rt_frozen f
-      JOIN _rt_open o ON o.order_item_id = f.order_item_id
-      CROSS JOIN LATERAL public.logistics_frozen_allocation_scaled(f.order_item_id, o.qty) s;
-    INSERT INTO _rt_demand AS d
-    SELECT trade_item_key, SUM(qty) FROM _rt_alloc GROUP BY trade_item_key
-    ON CONFLICT (trade_item_key) DO UPDATE SET qty = d.qty + EXCLUDED.qty;
-    INSERT INTO _rt_keys SELECT DISTINCT trade_item_key FROM _rt_alloc ON CONFLICT DO NOTHING;
-  END IF;
-
-  FOR oi_rec IN
-    SELECT o.order_item_id AS id, o.product_id, o.qty
-      FROM _rt_open o JOIN _rt_lines l ON l.order_item_id = o.order_item_id
-     WHERE NOT EXISTS (SELECT 1 FROM _rt_frozen f WHERE f.order_item_id = o.order_item_id)
-     ORDER BY o.created_at, o.order_item_id
-  LOOP
-    SELECT string_agg(e.note, '; ') INTO v_err FROM _rt_pexp e WHERE e.product_id = oi_rec.product_id AND e.kind = 'error';
-    IF v_err IS NOT NULL THEN
-      v_struct := v_struct || jsonb_build_object('order_item_id', oi_rec.id, 'product_id', oi_rec.product_id, 'reden', v_err);
-      v_struct_qty := v_struct_qty + oi_rec.qty;
-      CONTINUE;
-    END IF;
-
-    FOR part IN
-      SELECT e.kind, e.ref, e.qty * oi_rec.qty AS qty
-        FROM _rt_pexp e WHERE e.product_id = oi_rec.product_id ORDER BY e.ord
-    LOOP
-      IF part.kind = 'item' THEN
-        SELECT canon_key INTO v_key FROM _rt_raw WHERE raw_key = part.ref;
-        IF v_key IS NULL THEN
-          v_skipped := v_skipped || to_jsonb(part.ref);
-          v_skipped_qty := v_skipped_qty + part.qty;
-        ELSE
-          INSERT INTO _rt_demand AS d VALUES (v_key, part.qty)
-            ON CONFLICT (trade_item_key) DO UPDATE SET qty = d.qty + EXCLUDED.qty;
-          INSERT INTO _rt_alloc VALUES (oi_rec.id, v_key, part.qty, 'item', NULL);
-        END IF;
-      ELSE
-        v_remaining := part.qty;
-        v_last_key := NULL;
-        FOR member_rec IN
-          SELECT g.canon_key FROM _rt_gm g WHERE g.group_id = part.ref::uuid ORDER BY g.ord
-        LOOP
-          v_key := member_rec.canon_key;
-          IF v_key IS NULL THEN CONTINUE; END IF;
-          v_last_key := v_key;
-          IF v_remaining <= 0 THEN CONTINUE; END IF;
-
-          SELECT GREATEST(COALESCE(MAX(s.physical_stock), 0)
-                          - COALESCE((SELECT d.qty FROM _rt_demand d WHERE d.trade_item_key = v_key), 0), 0)
-            INTO v_available
-            FROM public.trade_item_stock s
-           WHERE s.trade_item_key = v_key;
-
-          IF COALESCE(v_available, 0) <= 0 THEN CONTINUE; END IF;
-          v_take := LEAST(v_available, v_remaining);
-          INSERT INTO _rt_demand AS d VALUES (v_key, v_take)
-            ON CONFLICT (trade_item_key) DO UPDATE SET qty = d.qty + EXCLUDED.qty;
-          INSERT INTO _rt_alloc VALUES (oi_rec.id, v_key, v_take, 'group', part.ref::uuid);
-          v_remaining := v_remaining - v_take;
-        END LOOP;
-
-        IF v_remaining > 0 THEN
-          IF v_last_key IS NULL THEN
-            v_skipped := v_skipped || to_jsonb('group:' || part.ref);
-            v_skipped_qty := v_skipped_qty + v_remaining;
-          ELSE
-            INSERT INTO _rt_demand AS d VALUES (v_last_key, v_remaining)
-              ON CONFLICT (trade_item_key) DO UPDATE SET qty = d.qty + EXCLUDED.qty;
-            INSERT INTO _rt_alloc VALUES (oi_rec.id, v_last_key, v_remaining, 'group', part.ref::uuid);
-          END IF;
-        END IF;
-      END IF;
-    END LOOP;
-  END LOOP;
-
-  DELETE FROM public.logistics_reservation_allocations a
-   WHERE a.order_item_id IN (SELECT l.order_item_id FROM _rt_lines l);
-  INSERT INTO public.logistics_reservation_allocations (order_item_id, trade_item_key, qty, source, group_id, line_qty)
-  SELECT r.order_item_id, r.trade_item_key, SUM(r.qty), r.source, r.group_id, MAX(o.qty)
-    FROM _rt_alloc r
-    LEFT JOIN _rt_open o ON o.order_item_id = r.order_item_id
-   WHERE r.qty > 0
-   GROUP BY r.order_item_id, r.trade_item_key, r.source, r.group_id;
-
-  PERFORM set_config('stock.change_source', 'RESERVATION_RECOMPUTE', true);
-  UPDATE public.trade_item_stock s
-     SET reserved_stock = CEIL(COALESCE(d.qty, 0))::integer,
-         change_source  = 'RESERVATION_RECOMPUTE',
-         updated_at     = now()
-    FROM _rt_keys k
-    LEFT JOIN _rt_demand d ON d.trade_item_key = k.canon_key
-   WHERE s.trade_item_key = k.canon_key
-     AND s.reserved_stock IS DISTINCT FROM CEIL(COALESCE(d.qty, 0))::integer;
-  GET DIAGNOSTICS v_changed = ROW_COUNT;
-
-  v_ms := round(extract(epoch FROM clock_timestamp() - v_t0) * 1000, 1);
-
-  IF jsonb_array_length(v_skipped) > 0 THEN
-    PERFORM public.logistics_trace(jsonb_build_object(
-      'phase', 'reservering', 'step', 'reservering herberekenen', 'status', 'waarschuwing',
-      'actor', 'logistics_recompute_reserved_targeted', 'errorClass', 'ontbrekende_gegevens',
-      'reason', 'Geen voorraadrij en geen actieve Floriday-koppeling om die aan te maken; reservering voor deze artikelen niet berekend.',
-      'values', jsonb_build_object('product_id', p_product_id,
-        'sleutels', (SELECT jsonb_agg(DISTINCT x) FROM jsonb_array_elements_text(v_skipped) x),
-        'gemiste_vraag_stuks', v_skipped_qty)));
-  END IF;
-
-  IF jsonb_array_length(v_struct) > 0 THEN
-    PERFORM public.logistics_trace(jsonb_build_object(
-      'phase', 'reservering', 'step', 'reservering herberekenen', 'status', 'waarschuwing',
-      'actor', 'logistics_recompute_reserved_targeted', 'errorClass', 'structuur',
-      'reason', 'Samenstelling met een lus of te diepe nesting; voor deze bestelregels is niets gereserveerd.',
-      'values', jsonb_build_object('regels', v_struct, 'gemiste_vraag_stuks', v_struct_qty)));
-  END IF;
-
-  IF v_ms > v_trace_ms THEN
-    PERFORM public.logistics_trace(jsonb_build_object(
-      'phase', 'reservering', 'step', 'reservering herberekenen', 'status', 'waarschuwing',
-      'actor', 'logistics_recompute_reserved_targeted', 'errorClass', 'traag',
-      'reason', 'Gerichte herberekening duurde langer dan verwacht.',
-      'values', jsonb_build_object('product_id', p_product_id, 'regels', v_nlines,
-                                   'sleutels', (SELECT count(*) FROM _rt_keys), 'duur_ms', v_ms)));
-  END IF;
-
-  IF v_freeze THEN
-    SELECT array_agg(order_item_id) INTO v_frozen_ids FROM _rt_frozen;
-    SELECT array_agg(order_item_id) INTO v_line_ids FROM _rt_lines;
-    PERFORM public.logistics_report_frozen_shortage(v_frozen_ids);
-    PERFORM public.logistics_allocation_check_changes(v_line_ids);
-  END IF;
-
-  PERFORM set_config('app.recomputing_reserved', 'off', true);
-  RETURN jsonb_build_object('status', 'gericht', 'regels', v_nlines,
-                            'sleutels', (SELECT count(*) FROM _rt_keys), 'gewijzigd', v_changed, 'duur_ms', v_ms);
-END
-$function$
-$fsdef$;
-EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_recompute_reserved_targeted overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
-END $fsdo$;
-
-DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_reconcile_missing_plan_queue()
- RETURNS integer
- LANGUAGE plpgsql
- SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
-DECLARE r record; n integer := 0;
-BEGIN
-  FOR r IN
-    SELECT o.id FROM public.orders o
-     WHERE o.deleted_at IS NULL
-       AND COALESCE(o.is_reservation,false) = false
-       AND o.plan_locked_at IS NULL
-       AND o.order_number IS NOT NULL
-       AND (o.created_at >= now() - interval '14 days' OR o.updated_at >= now() - interval '14 days')
-       AND NOT EXISTS (SELECT 1 FROM public.logistics_tasks t WHERE t.order_ref = o.order_number)
-       AND NOT EXISTS (SELECT 1 FROM public.logistics_plan_queue q
-                        WHERE q.order_id = o.id AND q.status IN ('pending','running'))
-       -- Geblokkeerd en sindsdien niets veranderd aan order, regels of product: niet opnieuw proberen.
-       AND NOT EXISTS (
-         SELECT 1 FROM public.logistics_plan_queue q
-          WHERE q.order_id = o.id AND q.status = 'geblokkeerd'
-            AND q.updated_at >= COALESCE(o.updated_at, o.created_at)
-            AND NOT EXISTS (SELECT 1 FROM logistics_active.order_items oi WHERE oi.order_id = o.id AND oi.created_at > q.updated_at)
-            AND NOT EXISTS (SELECT 1 FROM logistics_active.order_items oi JOIN public.products p ON p.id = oi.product_id
-                             WHERE oi.order_id = o.id AND p.updated_at > q.updated_at))
-     ORDER BY o.created_at ASC
-     LIMIT 500
-  LOOP
-    PERFORM public.logistics_plan_enqueue(r.id, 'reconcile');
-    n := n + 1;
-  END LOOP;
-  RETURN n;
-END;
-$function$
-$fsdef$;
-EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_reconcile_missing_plan_queue overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
-END $fsdo$;
-
-DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_refresh_pick_queue_status(p_ref text)
- RETURNS integer
- LANGUAGE plpgsql
- SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
-declare v_status jsonb; v_ref text; v_updated integer := 0;
-begin
-  v_ref := btrim(coalesce(p_ref, ''));
-  if v_ref = '' then return 0; end if;
-  v_status := public.logistics_cart_plan_status(v_ref);
-  v_ref := coalesce(v_status->>'orderRef', v_ref);
-  update public.pick_queue q
-     set payload = coalesce(q.payload, '{}'::jsonb) || jsonb_build_object(
-           'cartPlanReady', coalesce((v_status->>'ready')::boolean, false),
-           'cartPlanReleased', coalesce((v_status->>'released')::boolean, false),
-           'cartPlanReason', v_status->>'reason',
-           'cartPlanState', v_status->>'state',
-           'pickMode', v_status->>'pickMode',
-           'totalCarts', coalesce((v_status->>'totalCarts')::integer, 0),
-           'fullCarts', coalesce((v_status->>'fullCarts')::integer, 0),
-           'partialCarts', coalesce((v_status->>'partialCarts')::integer, 0)),
-         updated_at = now()
-   where q.cancelled_at is null
-     and (q.order_number = v_ref or coalesce(q.payload->>'cartRowFor', '') = v_ref);
-  get diagnostics v_updated = row_count;
-  return v_updated;
-end; $function$
-$fsdef$;
-EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_refresh_pick_queue_status overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
-END $fsdo$;
+declare v_status jsonb; v_ref text; v_updated integer := 0;
+begin
+  v_ref := btrim(coalesce(p_ref, ''));
+  if v_ref = '' then return 0; end if;
+  v_status := public.logistics_cart_plan_status(v_ref);
+  v_ref := coalesce(v_status->>'orderRef', v_ref);
+  update public.pick_queue q
+     set payload = coalesce(q.payload, '{}'::jsonb) || jsonb_build_object(
+           'cartPlanReady', coalesce((v_status->>'ready')::boolean, false),
+           'cartPlanReleased', coalesce((v_status->>'released')::boolean, false),
+           'cartPlanReason', v_status->>'reason',
+           'cartPlanState', v_status->>'state',
+           'pickMode', v_status->>'pickMode',
+           'totalCarts', coalesce((v_status->>'totalCarts')::integer, 0),
+           'fullCarts', coalesce((v_status->>'fullCarts')::integer, 0),
+           'partialCarts', coalesce((v_status->>'partialCarts')::integer, 0)),
+         updated_at = now()
+   where q.cancelled_at is null
+     and (q.order_number = v_ref or coalesce(q.payload->>'cartRowFor', '') = v_ref);
+  get diagnostics v_updated = row_count;
+  return v_updated;
+end; $function$
+$fsdef$;
+EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
+  RAISE NOTICE 'logistiek-engine: functie public.logistics_refresh_pick_queue_status overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
+END $fsdo$;
 
 DO $fsdo$ BEGIN
   EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_refresh_pickup_moments(p_weeks integer DEFAULT 4)
@@ -18947,265 +18064,78 @@ BEGIN
 
   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$
-$fsdef$;
-EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_reserved_key overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
-END $fsdo$;
-
-DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_reserved_order_excluded(p_order_id uuid)
- RETURNS boolean
- LANGUAGE plpgsql
- STABLE SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
-DECLARE r record; a jsonb;
-BEGIN
-  SELECT o.deleted_at, o.cancelled_at, o.status INTO r FROM public.orders o WHERE o.id = p_order_id;
-  IF NOT FOUND THEN RETURN false; END IF;
-  IF r.deleted_at IS NOT NULL OR r.cancelled_at IS NOT NULL
-     OR lower(coalesce(r.status, '')) IN ('geannuleerd', 'cancelled') THEN
-    RETURN true;
-  END IF;
-  BEGIN
-    a := public.logistics_order_is_archived(p_order_id);
-    RETURN coalesce((a->>'gearchiveerd')::boolean, false);
-  EXCEPTION WHEN OTHERS THEN
-    RETURN false; -- leesfout: order blijft meetellen (fail closed)
-  END;
-END $function$
-$fsdef$;
-EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_reserved_order_excluded overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
-END $fsdo$;
-
-DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_reserved_stock_nightly()
- RETURNS void
- LANGUAGE plpgsql
- SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
-BEGIN
-  PERFORM set_config('statement_timeout', '600000', true);
-  PERFORM public.recompute_all_reserved_stock();
-END
-$function$
-$fsdef$;
-EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_reserved_stock_nightly overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
-END $fsdo$;
-
-DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_resolve_pick_document(_queue_item_id uuid, _voorbeeld boolean, _session_id text, _is_herprint boolean)
- RETURNS jsonb
- LANGUAGE plpgsql
- STABLE SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
-DECLARE
-  item public.pick_queue;
-  dt public.pick_document_types;
-  doc_code text;
-  target_layout uuid;
-  target_plek uuid;
-  layout_meta jsonb;
-  v_types public.doc_layout_type[];
-  doc_type public.doc_layout_type := 'vrij';
-  layout_type public.doc_layout_type;
-  pdf_url text;
-  pdf_b64 text;
-  herkomst text;
-  v_variant text;
-  v_is_partial boolean := false;
-  v_cart_id uuid;
-  v_cart jsonb;
-  v_order_id uuid;
-  v_barcode text;
-  v_barcode_on boolean := public.logistics_pick_barcode_enabled();
-BEGIN
-  SELECT * INTO item FROM public.pick_queue WHERE id = _queue_item_id;
-  IF NOT FOUND THEN
-    RAISE EXCEPTION 'Dit document bestaat niet meer.' USING ERRCODE = 'P0002';
-  END IF;
-
-  SELECT * INTO dt FROM public.pick_document_types WHERE id = item.document_type_id;
-
-  doc_code := lower(btrim(coalesce(
-    nullif(item.payload->>'documentType', ''),
-    nullif(dt.code, ''),
-    ''
-  )));
-
-  v_types := public.logistics_document_type_map(doc_code);
-
-  BEGIN
-    v_cart_id := nullif(coalesce(
-      item.payload->>'cartId', item.payload->>'cart_id',
-      item.payload->'data'->>'cartId', item.payload->'data'->>'cart_id'
-    ), '')::uuid;
-  EXCEPTION WHEN invalid_text_representation THEN
-    v_cart_id := NULL;
-  END;
-
-  IF v_cart_id IS NOT NULL THEN
-    SELECT COALESCE(c.order_id, (
-      SELECT oi.order_id FROM logistics_active.order_cart_items ci
-        JOIN logistics_active.order_items oi ON oi.id = ci.order_item_id
-       WHERE ci.cart_id = c.id LIMIT 1))
-      INTO v_order_id
-      FROM logistics_active.order_carts c WHERE c.id = v_cart_id;
-
-    IF v_order_id IS NOT NULL THEN
-      SELECT c INTO v_cart
-        FROM jsonb_array_elements(public.logistics_cart_slip_plan(v_order_id)->'carts') AS c
-       WHERE (c->>'cartId')::uuid = v_cart_id;
-    END IF;
-
-    IF v_barcode_on THEN
-      v_barcode := COALESCE(
-        (SELECT b.barcode FROM public.logistics_cart_barcode b WHERE b.cart_id = v_cart_id),
-        public.logistics_cart_barcode_value(v_cart_id)
-      );
-      IF v_cart IS NOT NULL THEN
-        v_cart := v_cart || jsonb_build_object('barcode', v_barcode);
-      END IF;
-    END IF;
-  END IF;
-
-  IF v_cart IS NOT NULL THEN
-    v_is_partial := NOT COALESCE((v_cart->>'isFullCart')::boolean, false);
-  ELSE
-    v_variant := nullif(coalesce(
-      item.payload->>'slipVariant',
-      item.payload->'data'->>'slipVariant'
-    ), '');
-    IF v_variant IS NOT NULL THEN
-      v_is_partial := (v_variant = 'partial_order');
-    ELSIF nullif(coalesce(item.payload->>'pickUnit', item.payload->'data'->>'pickUnit'), '') IS NOT NULL THEN
-      v_is_partial := (coalesce(item.payload->>'pickUnit', item.payload->'data'->>'pickUnit') = 'order');
-    ELSE
-      v_is_partial := (item.cart_count IS NOT NULL AND item.cart_count <= 1);
-    END IF;
-  END IF;
-
-  BEGIN
-    target_layout := nullif(coalesce(
-      item.payload->'layout'->>'layout_id',
-      item.payload->>'layout_id'
-    ), '')::uuid;
-  EXCEPTION WHEN invalid_text_representation THEN
-    target_layout := NULL;
-  END;
-
-  IF target_layout IS NULL AND doc_code <> '' THEN
-    layout_meta := public.logistics_document_layout_v2(doc_code, v_is_partial);
-    BEGIN
-      target_layout := nullif(layout_meta->>'layout_id', '')::uuid;
-    EXCEPTION WHEN invalid_text_representation THEN
-      target_layout := NULL;
-    END;
-  END IF;
-
-  SELECT l.documenttype INTO layout_type
-    FROM public.document_layouts l
-   WHERE l.id = target_layout AND l.actief IS TRUE;
-
-  IF layout_type IS NULL THEN target_layout := NULL; END IF;
+  EXCEPTION WHEN others THEN
+    v_pid := NULL;
+  END;
 
-  doc_type := COALESCE(layout_type, v_types[1], 'vrij');
+  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 item.station_id IS NOT NULL THEN
-    SELECT k.print_plek_id INTO target_plek
-      FROM public.print_plek_koppelingen k
-     WHERE k.bron IN ('pickstation', 'pick_station')
-       AND k.bron_id = item.station_id::text
-     ORDER BY k.created_at
-     LIMIT 1;
+  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$
+$fsdef$;
+EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
+  RAISE NOTICE 'logistiek-engine: functie public.logistics_reserved_key overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
+END $fsdo$;
 
-  pdf_url  := nullif(item.payload->>'pdf_url', '');
-  pdf_b64  := nullif(item.payload->>'pdf_base64', '');
-  herkomst := nullif(item.payload->>'herkomst', '');
+DO $fsdo$ BEGIN
+  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_reserved_order_excluded(p_order_id uuid)
+ RETURNS boolean
+ LANGUAGE plpgsql
+ STABLE SECURITY DEFINER
+ SET search_path TO 'public'
+AS $function$
+DECLARE r record; a jsonb;
+BEGIN
+  SELECT o.deleted_at, o.cancelled_at, o.status INTO r FROM public.orders o WHERE o.id = p_order_id;
+  IF NOT FOUND THEN RETURN false; END IF;
+  IF r.deleted_at IS NOT NULL OR r.cancelled_at IS NOT NULL
+     OR lower(coalesce(r.status, '')) IN ('geannuleerd', 'cancelled') THEN
+    RETURN true;
+  END IF;
+  BEGIN
+    a := public.logistics_order_is_archived(p_order_id);
+    RETURN coalesce((a->>'gearchiveerd')::boolean, false);
+  EXCEPTION WHEN OTHERS THEN
+    RETURN false; -- leesfout: order blijft meetellen (fail closed)
+  END;
+END $function$
+$fsdef$;
+EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
+  RAISE NOTICE 'logistiek-engine: functie public.logistics_reserved_order_excluded overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
+END $fsdo$;
 
-  RETURN jsonb_build_object(
-    'queue_item_id', item.id,
-    'station_id',    item.station_id,
-    'doc_code',      doc_code,
-    'layout_id',     target_layout,
-    'layout_variant', CASE WHEN v_is_partial THEN 'partial_order' ELSE 'full_cart' END,
-    'cart_id',       v_cart_id,
-    'cart',          v_cart,
-    'barcode',       v_barcode,
-    'documenttype',  doc_type,
-    'documentnaam',  COALESCE(item.document_number, 'Pickdocument'),
-    'pdf_url',       pdf_url,
-    'pdf_base64',    pdf_b64,
-    'herkomst',      herkomst,
-    'render_html',   nullif(item.payload->>'render_html', ''),
-    'print_plek_id', target_plek,
-    'foutmelding',
-      CASE WHEN target_layout IS NULL AND pdf_url IS NULL AND pdf_b64 IS NULL
-        THEN 'Geen actieve layout gevonden voor documentsoort "' || COALESCE(nullif(doc_code, ''), 'onbekend') || '". Maak een layout aan in de Layout maker of koppel er een in de Logistiek Engine.'
-        ELSE NULL END,
-    'payload', jsonb_build_object(
-      'source', 'pickstation',
-      'voorbeeld', COALESCE(_voorbeeld, false),
-      'queue_item_id', item.id,
-      'station_id', item.station_id,
-      'print_plek_id', target_plek,
-      'session_id', _session_id,
-      'is_herprint', COALESCE(_is_herprint, false),
-      'document_number', item.document_number,
-      'document_type_code', COALESCE(nullif(doc_code, ''), dt.code),
-      'layout_variant', CASE WHEN v_is_partial THEN 'partial_order' ELSE 'full_cart' END,
-      'layout_id', target_layout,
-      'report_key', dt.report_key,
-      'print_template', dt.print_template,
-      'order_number', item.order_number,
-      'customer_name', item.customer_name,
-      'reference', item.reference,
-      'barcode', CASE WHEN v_barcode_on THEN COALESCE(v_barcode, item.barcode) ELSE item.barcode END,
-      'cart_id', v_cart_id,
-      'cart_index', v_cart->>'cartIndex',
-      'cart_total', v_cart->>'cartTotal',
-      'cart_label', v_cart->>'cartLabel',
-      'cart_items', COALESCE(v_cart->'items', '[]'::jsonb),
-      'country_code', item.country_code,
-      'data', COALESCE(item.payload, '{}'::jsonb)
-                || jsonb_build_object('print_plek_id', target_plek)
-                || COALESCE(jsonb_build_object('cart', v_cart), '{}'::jsonb)
-    )
-  );
-END;
+DO $fsdo$ BEGIN
+  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_reserved_stock_nightly()
+ RETURNS void
+ LANGUAGE plpgsql
+ SECURITY DEFINER
+ SET search_path TO 'public'
+AS $function$
+BEGIN
+  PERFORM set_config('statement_timeout', '600000', true);
+  PERFORM public.recompute_all_reserved_stock();
+END
 $function$
 $fsdef$;
 EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_resolve_pick_document overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
+  RAISE NOTICE 'logistiek-engine: functie public.logistics_reserved_stock_nightly overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
 END $fsdo$;
 
+
 DO $fsdo$ BEGIN
   EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_resolve_product_id(p_label text)
  RETURNS uuid
@@ -21350,193 +20280,27 @@ DO $fsdo$ BEGIN
  IMMUTABLE
  SET search_path TO 'public'
 AS $function$
-DECLARE t text; m text[];
-BEGIN
-  IF p IS NULL OR p = 'null'::jsonb THEN RETURN NULL; END IF;
-  IF jsonb_typeof(p) = 'object' THEN
-    IF (p->>'width') ~ '^\d+(\.\d+)?$' AND (p->>'height') ~ '^\d+(\.\d+)?$' THEN
-      RETURN ARRAY[(p->>'width')::numeric, (p->>'height')::numeric];
-    END IF;
-    t := p::text;
-  ELSE
-    t := p #>> '{}';
-  END IF;
-  m := regexp_match(coalesce(t,''), '(\d+(?:[.,]\d+)?)\s*[xX×*]\s*(\d+(?:[.,]\d+)?)');
-  IF m IS NULL THEN RETURN NULL; END IF;
-  RETURN ARRAY[replace(m[1],',','.')::numeric, replace(m[2],',','.')::numeric];
-END; $function$
-$fsdef$;
-EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_sticker_parse_size overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
-END $fsdo$;
-
-DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_sticker_sync(p_limit integer DEFAULT 200)
- RETURNS jsonb
- LANGUAGE plpgsql
- SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
-DECLARE
-  s jsonb; v_rel text; v_station text; v_tray text;
-  st record; o record; d jsonb; fi jsonb; v_n int; v_order uuid; v_onr text;
-  v_copies int; v_size numeric[]; v_type text; v_should text; v_keep uuid[]; v_del text; v_fo text; v_cart uuid;
-  v_crates_tot int; v_pieces_tot int; r record; v_rows int;
-  n_st int := 0; n_tray int := 0;
-BEGIN
-  SELECT settings INTO s FROM public.logistics_rule_configs
-   ORDER BY is_active DESC, (status = 'actief') DESC, updated_at DESC LIMIT 1;
-  v_rel := public.logistics_rule_text(s, 'pickstations', 'sticker_release', 'with_pick_release');
-  v_station := CASE WHEN v_rel = 'with_packing_slip'
-                    THEN public.logistics_rule_text(s, 'pickstations', 'packing_slip_station', '')
-                    ELSE public.logistics_rule_text(s, 'pickstations', 'sticker_station', '') END;
-  v_tray := public.logistics_rule_text(s, 'pickstations', 'traysticker_release', 'uit');
-
-  FOR st IN SELECT * FROM public.floriday_customer_stickers_cache ORDER BY updated_at DESC LIMIT greatest(p_limit,1) LOOP
-    n_st := n_st + 1;
-    d := coalesce(st.data, '{}'::jsonb);
-    fi := coalesce(d->'stickerFileInformation', '{}'::jsonb);
-    v_size := CASE WHEN st.sticker_width_mm IS NOT NULL AND st.sticker_height_mm IS NOT NULL
-                   THEN ARRAY[st.sticker_width_mm::numeric, st.sticker_height_mm::numeric]
-                   ELSE public.logistics_sticker_parse_size(d->'stickerSize') END;
-    v_type := upper(nullif(btrim(coalesce(st.sticker_type, d->>'stickerType', '')), ''));
-    v_should := lower(coalesce(st.should_be_printed::text, fi->>'shouldBePrinted', ''));
-
-    -- Koppeling volgens Suppliers API 2026v1: alleen via salesOrderId.
-    SELECT count(*), (array_agg(id))[1], (array_agg(order_number))[1] INTO v_n, v_order, v_onr
-      FROM public.orders WHERE deleted_at IS NULL
-       AND nullif(btrim(coalesce(st.sales_order_id, d->>'salesOrderId', '')), '') IS NOT NULL
-       AND floriday_sales_order_id = coalesce(st.sales_order_id, d->>'salesOrderId');
-
-    IF coalesce(st.is_deleted,false) OR lower(coalesce(d->>'isDeleted','')) = 'true' THEN
-      UPDATE public.logistics_sticker_prints SET status = 'niet_printen', reden = 'De koper heeft deze sticker verwijderd.'
-       WHERE soort = 'sticker' AND bron_id = st.floriday_id AND status NOT IN ('in_printwachtrij','afgemeld');
-      CONTINUE;
-    END IF;
-    IF lower(coalesce(d->>'isHandled','')) = 'true' THEN
-      UPDATE public.logistics_sticker_prints SET status = 'afgemeld', reden = 'Al afgemeld in Floriday.', handled_at = coalesce(handled_at, now())
-       WHERE soort = 'sticker' AND bron_id = st.floriday_id AND status <> 'afgemeld';
-      CONTINUE;
-    END IF;
-    IF v_n = 1 AND public.logistics_sales_order_external_fulfilled(v_order, coalesce(st.sales_order_id, d->>'salesOrderId')) THEN
-      UPDATE public.logistics_sticker_prints SET status = 'niet_printen', reden = 'Afgehandeld in Floriday; door ons niet geprint en niet afgemeld.'
-       WHERE soort = 'sticker' AND bron_id = st.floriday_id AND status NOT IN ('in_printwachtrij','afgemeld');
-      PERFORM public.logistics_sticker_upsert('sticker', st.floriday_id, v_order, v_onr, NULL, 0, v_size, NULL, NULL, 'niet_printen', 'Afgehandeld in Floriday; door ons niet geprint en niet afgemeld.');
-      CONTINUE;
-    END IF;
-    IF v_n <> 1 THEN
-      PERFORM public.logistics_sticker_upsert('sticker', st.floriday_id, NULL, NULL, NULL, 0, v_size, NULL, NULL, 'geblokkeerd',
-        format('Geen eenduidige order bij Floriday-verkooporder %s (%s gevonden).', coalesce(st.sales_order_id, d->>'salesOrderId', 'onbekend'), v_n));
-      UPDATE public.logistics_sticker_prints SET sticker_type = v_type WHERE soort='sticker' AND bron_id = st.floriday_id;
-      CONTINUE;
-    END IF;
-    IF v_should = 'false' THEN
-      -- Geen printopdracht; zichtbaar als 'niet_printen'. Wordt ook niet afgemeld in Floriday.
-      UPDATE public.logistics_sticker_prints SET status = 'niet_printen',
-             reden = 'Floriday: deze sticker hoeft niet geprint te worden (shouldBePrinted = false).'
-       WHERE soort = 'sticker' AND bron_id = st.floriday_id AND cart_id IS NOT NULL AND status NOT IN ('in_printwachtrij','afgemeld');
-      PERFORM public.logistics_sticker_upsert('sticker', st.floriday_id, v_order, v_onr, NULL, 0, v_size, NULL, NULL, 'niet_printen',
-        'Floriday: deze sticker hoeft niet geprint te worden (shouldBePrinted = false).');
-      UPDATE public.logistics_sticker_prints SET sticker_type = v_type WHERE soort='sticker' AND bron_id = st.floriday_id;
-      CONTINUE;
-    END IF;
-    IF lower(coalesce(fi->>'deliverSeparately','')) = 'true' THEN
-      PERFORM public.logistics_sticker_upsert('sticker', st.floriday_id, v_order, v_onr, NULL, 0, v_size, NULL, NULL, 'geblokkeerd',
-        'Sticker moet apart worden geleverd (deliverSeparately); kies handmatig hoe die mee gaat.');
-      UPDATE public.logistics_sticker_prints SET sticker_type = v_type WHERE soort='sticker' AND bron_id = st.floriday_id;
-      CONTINUE;
-    END IF;
-    IF nullif(btrim(coalesce(d->>'salesOrderCorrectionRequestId','')),'') IS NOT NULL THEN
-      PERFORM public.logistics_sticker_upsert('sticker', st.floriday_id, v_order, v_onr, NULL, 0, v_size, NULL, NULL, 'wacht_op_moment',
-        'Wacht tot de correctie op de verkooporder is verwerkt.');
-      CONTINUE;
-    END IF;
-    v_copies := CASE WHEN (fi->>'numberOfCopies') ~ '^\d+$' THEN (fi->>'numberOfCopies')::int ELSE NULL END;
-    IF coalesce(v_copies,0) <= 0 THEN
-      PERFORM public.logistics_sticker_upsert('sticker', st.floriday_id, v_order, v_onr, NULL, 0, v_size, NULL, NULL, 'geblokkeerd',
-        'Floriday gaf geen aantal kopieën (numberOfCopies) mee; niet geprint.');
-      UPDATE public.logistics_sticker_prints SET sticker_type = v_type WHERE soort='sticker' AND bron_id = st.floriday_id;
-      CONTINUE;
-    END IF;
-    IF v_type IS NULL OR v_type NOT IN ('POT','PRODUCT','SLEEVE','PACKAGE','LAYER','LOAD_CARRIER') THEN
-      PERFORM public.logistics_sticker_upsert('sticker', st.floriday_id, v_order, v_onr, NULL, v_copies, v_size, NULL, NULL, 'geblokkeerd',
-        format('Onbekende of niet-ondersteunde stickersoort (%s); kies handmatig hoe deze sticker mee gaat.', coalesce(v_type,'leeg')));
-      UPDATE public.logistics_sticker_prints SET sticker_type = v_type WHERE soort='sticker' AND bron_id = st.floriday_id;
-      CONTINUE;
-    END IF;
-
-    v_keep := ARRAY[]::uuid[]; v_rows := 0; v_crates_tot := 0; v_pieces_tot := 0;
-    FOR r IN SELECT * FROM public.logistics_sticker_distribution(v_order, v_type, v_copies, nullif(btrim(coalesce(st.trade_item_id,'')),'')) LOOP
-      v_rows := v_rows + 1; v_keep := v_keep || r.cart_id;
-      v_crates_tot := v_crates_tot + r.crates; v_pieces_tot := v_pieces_tot + r.pieces;
-      PERFORM public.logistics_sticker_upsert('sticker', st.floriday_id, v_order, v_onr, r.cart_id, r.kopieen, v_size,
-        public.logistics_sticker_cart_plek(r.cart_id, v_station), NULL,
-        CASE WHEN public.logistics_cart_slip_queued(r.cart_id) THEN 'klaar' ELSE 'wacht_op_moment' END,
-        CASE WHEN public.logistics_cart_slip_queued(r.cart_id) THEN NULL ELSE 'Wacht op de pakbon van deze kar.' END);
-    END LOOP;
-    IF v_rows = 0 THEN
-      PERFORM public.logistics_sticker_upsert('sticker', st.floriday_id, v_order, v_onr, NULL, v_copies, v_size, NULL, NULL, 'geblokkeerd',
-        'De verdeling over karren sluit niet: de order staat (nog) niet op een kar, of de karren hebben geen fusten/stuks van dit artikel.');
-      UPDATE public.logistics_sticker_prints SET sticker_type = v_type WHERE soort='sticker' AND bron_id = st.floriday_id;
-      CONTINUE;
-    END IF;
-    UPDATE public.logistics_sticker_prints SET sticker_type = v_type WHERE soort='sticker' AND bron_id = st.floriday_id;
-    IF (v_type IN ('PACKAGE','LAYER') AND v_crates_tot <> v_copies) OR (v_type IN ('POT','PRODUCT','SLEEVE') AND v_pieces_tot <> v_copies) THEN
-      BEGIN
-        INSERT INTO public.logistics_trace_events(phase, step, status, reason, order_ref)
-        SELECT 'stickers', 'Aantal klantstickers wijkt af', 'waarschuwing',
-               format('Floriday vraagt %s (%s); op de karren: %s fusten / %s stuks. Het aantal van Floriday wordt geprint.',
-                      v_copies, v_type, v_crates_tot, v_pieces_tot), v_onr
-         WHERE NOT EXISTS (SELECT 1 FROM public.logistics_trace_events e WHERE e.order_ref = v_onr AND e.step = 'Aantal klantstickers wijkt af'
-                             AND e.created_at > now() - interval '1 day');
-      EXCEPTION WHEN OTHERS THEN NULL; END;
+DECLARE t text; m text[];
+BEGIN
+  IF p IS NULL OR p = 'null'::jsonb THEN RETURN NULL; END IF;
+  IF jsonb_typeof(p) = 'object' THEN
+    IF (p->>'width') ~ '^\d+(\.\d+)?$' AND (p->>'height') ~ '^\d+(\.\d+)?$' THEN
+      RETURN ARRAY[(p->>'width')::numeric, (p->>'height')::numeric];
     END IF;
-    UPDATE public.logistics_sticker_prints SET status = 'niet_printen',
-           reden = CASE WHEN cart_id IS NULL THEN 'Vervangen door regels per kar.' ELSE 'Kar hoort niet meer bij deze sticker.' END
-     WHERE soort = 'sticker' AND bron_id = st.floriday_id
-       AND (cart_id IS NULL OR NOT (cart_id = ANY (v_keep)))
-       AND status NOT IN ('in_printwachtrij','afgemeld','niet_printen');
-  END LOOP;
-
-  IF v_tray <> 'uit' THEN
-    FOR o IN
-      SELECT o.id, o.order_number, nullif(btrim(o.floriday_sales_order_id),'') AS sales
-        FROM public.orders o
-       WHERE o.deleted_at IS NULL AND nullif(btrim(o.floriday_sales_order_id),'') IS NOT NULL
-         AND o.delivery_date >= current_date - 2
-         AND EXISTS (SELECT 1 FROM logistics_active.order_carts oc WHERE oc.order_id = o.id)
-       ORDER BY o.delivery_date LIMIT greatest(p_limit,1)
-    LOOP
-      SELECT d2.floriday_id INTO v_del FROM public.floriday_delivery_orders_cache d2
-       WHERE d2.data @> jsonb_build_object('fulfillmentRequests', jsonb_build_array(jsonb_build_object('salesOrderId', o.sales)))
-       ORDER BY d2.fetched_at DESC LIMIT 1;
-      IF v_del IS NULL THEN CONTINUE; END IF;
-      IF EXISTS (SELECT 1 FROM public.logistics_sticker_prints WHERE soort = 'traysticker' AND bron_id = v_del) THEN
-        v_fo := public.logistics_afhandeling_fulfillment_order(o.id)->>'fulfillmentOrderId';
-        IF v_fo IS NOT NULL THEN
-          UPDATE public.logistics_sticker_prints SET fulfillment_order_id = v_fo
-           WHERE soort = 'traysticker' AND bron_id = v_del AND fulfillment_order_id IS DISTINCT FROM v_fo
-             AND status NOT IN ('in_printwachtrij','afgemeld');
-        END IF;
-        CONTINUE;
-      END IF;
-      SELECT oc.id INTO v_cart FROM logistics_active.order_carts oc WHERE oc.order_id = o.id ORDER BY oc.cart_number, oc.created_at LIMIT 1;
-      v_fo := public.logistics_afhandeling_fulfillment_order(o.id)->>'fulfillmentOrderId';
-      PERFORM public.logistics_sticker_upsert('traysticker', v_del, o.id, o.order_number, v_cart, 1, NULL,
-        public.logistics_sticker_cart_plek(v_cart, v_station), v_fo, 'wacht_op_moment',
-        'Wacht op geaccepteerde belading in Floriday.');
-      n_tray := n_tray + 1;
-    END LOOP;
+    t := p::text;
+  ELSE
+    t := p #>> '{}';
   END IF;
-
-  RETURN jsonb_build_object('stickers', n_st, 'trayNieuw', n_tray, 'release', v_rel, 'trayRelease', v_tray,
-                            'klantstickerMoment', 'with_packing_slip');
+  m := regexp_match(coalesce(t,''), '(\d+(?:[.,]\d+)?)\s*[xX×*]\s*(\d+(?:[.,]\d+)?)');
+  IF m IS NULL THEN RETURN NULL; END IF;
+  RETURN ARRAY[replace(m[1],',','.')::numeric, replace(m[2],',','.')::numeric];
 END; $function$
 $fsdef$;
 EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_sticker_sync overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
+  RAISE NOTICE 'logistiek-engine: functie public.logistics_sticker_parse_size overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
 END $fsdo$;
 
+
 DO $fsdo$ BEGIN
   EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_sticker_touch()
  RETURNS trigger
@@ -22396,64 +21160,6 @@ EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR inva
   RAISE NOTICE 'logistiek-engine: functie public.logistics_tasks_prune overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
 END $fsdo$;
 
-DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_tick()
- RETURNS jsonb
- LANGUAGE plpgsql
- SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
-DECLARE v_result jsonb := '{}'::jsonb; v_start timestamptz := clock_timestamp(); v_t timestamptz; v_err boolean := false;
-BEGIN
-  v_t := clock_timestamp();
-  BEGIN
-    PERFORM set_config('statement_timeout', '15000', true);
-    PERFORM public.logistics_rebuffer_pending();
-    v_result := v_result || jsonb_build_object('rebuffer', 'ok');
-  EXCEPTION WHEN OTHERS THEN
-    v_err := true;
-    IF SQLERRM ILIKE '%tijdzone%' THEN
-      v_result := v_result || jsonb_build_object('rebuffer', 'overgeslagen: tijdzone ontbreekt in Werktijden');
-      BEGIN
-        UPDATE public.logistics_rebuffer_state SET last_error = 'Herindelen overgeslagen: de tijdzone ontbreekt in Werktijden.', updated_at = now() WHERE id;
-      EXCEPTION WHEN OTHERS THEN NULL; END;
-    ELSE
-      v_result := v_result || jsonb_build_object('rebuffer', left(SQLERRM, 200));
-    END IF;
-  END;
-  v_result := v_result || jsonb_build_object('rebuffer_ms', (extract(epoch from clock_timestamp()-v_t)*1000)::int);
-
-  v_t := clock_timestamp();
-  BEGIN
-    PERFORM set_config('statement_timeout', '20000', true);
-    PERFORM public.run_logistics_tasks_dispatch();
-    v_result := v_result || jsonb_build_object('taken', 'ok');
-  EXCEPTION WHEN OTHERS THEN
-    v_err := true; v_result := v_result || jsonb_build_object('taken', left(SQLERRM, 200));
-  END;
-  v_result := v_result || jsonb_build_object('taken_ms', (extract(epoch from clock_timestamp()-v_t)*1000)::int);
-
-  v_t := clock_timestamp();
-  BEGIN
-    PERFORM set_config('statement_timeout', '20000', true);
-    v_result := v_result || jsonb_build_object('afgerond', public.logistics_order_finalize_run(25, 120));
-  EXCEPTION WHEN OTHERS THEN
-    v_err := true; v_result := v_result || jsonb_build_object('afgerond', left(SQLERRM, 200));
-  END;
-  v_result := v_result || jsonb_build_object('afgerond_ms', (extract(epoch from clock_timestamp()-v_t)*1000)::int);
-
-  BEGIN
-    INSERT INTO public.logistics_tick_runs(started_at, finished_at, duration_ms, has_error, steps)
-    VALUES (v_start, clock_timestamp(), (extract(epoch from clock_timestamp()-v_start)*1000)::int, v_err, v_result);
-  EXCEPTION WHEN OTHERS THEN NULL;
-  END;
-  PERFORM set_config('statement_timeout', '30000', true);
-  RETURN v_result;
-END $function$
-$fsdef$;
-EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_tick overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
-END $fsdo$;
 
 DO $fsdo$ BEGIN
   EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_tick_base_url_check()
@@ -24279,724 +22985,468 @@ DO $fsdo$ BEGIN
  LANGUAGE sql
  STABLE SECURITY DEFINER
  SET search_path TO 'public'
-AS $function$ SELECT nullif(btrim(t.timezone), '') FROM public.logistics_time_settings t ORDER BY t.updated_at DESC NULLS LAST LIMIT 1 $function$
-$fsdef$;
-EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_tz overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
-END $fsdo$;
-
-DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_unit_all_carts_scanned(p_order_id uuid)
- RETURNS boolean
- LANGUAGE sql
- STABLE SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
-  SELECT NOT EXISTS (SELECT 1 FROM unnest(public.logistics_unit_order_ids(p_order_id)) m
-                      WHERE NOT public.logistics_order_all_carts_scanned(m))
-     AND NOT EXISTS (SELECT 1 FROM public.orders o JOIN logistics_active.order_carts c ON c.buffer_id = o.buffer_id AND c.order_id IS NULL
-                      WHERE o.id = p_order_id AND cardinality(public.logistics_unit_order_ids(p_order_id)) > 1
-                        AND NOT public.logistics_cart_scanned(c.id))
-$function$
-$fsdef$;
-EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_unit_all_carts_scanned overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
-END $fsdo$;
-
-DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_unit_order_ids(p_order_id uuid)
- RETURNS uuid[]
- LANGUAGE sql
- STABLE SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
-  WITH o AS (SELECT id, buffer_id FROM public.orders WHERE id = p_order_id),
-  m AS (SELECT o2.id, o2.order_number FROM o JOIN public.orders o2 ON o2.buffer_id = o.buffer_id
-         WHERE o.buffer_id IS NOT NULL AND o2.deleted_at IS NULL AND o2.cancelled_at IS NULL)
-  SELECT CASE WHEN (SELECT count(*) FROM m) > 1 THEN (SELECT array_agg(id ORDER BY order_number, id) FROM m)
-              ELSE ARRAY[p_order_id] END
-$function$
-$fsdef$;
-EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_unit_order_ids overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
-END $fsdo$;
-
-DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_upsert_task(p_user_id uuid, p_run_id uuid, p_order_ref text, p_buffer_ref text, p_strategy_id uuid, p_rule_config_id uuid, p_rule_version integer, p_task_type text, p_owner text, p_sequence integer, p_start timestamp with time zone, p_end timestamp with time zone, p_shadow boolean, p_payload jsonb)
- RETURNS text
- LANGUAGE plpgsql
- SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
-DECLARE existing public.logistics_tasks%ROWTYPE;
-BEGIN
-  SELECT * INTO existing FROM public.logistics_tasks
-   WHERE user_id = p_user_id AND order_ref = p_order_ref AND task_type = p_task_type
-     AND status NOT IN ('cancelled','superseded')
-   ORDER BY created_at DESC LIMIT 1;
-
-  IF FOUND THEN
-    IF existing.status IN ('claimed','in_progress','done','skipped') THEN
-      RETURN 'locked';
-    END IF;
-    UPDATE public.logistics_tasks SET
-      plan_run_id = p_run_id, buffer_ref = p_buffer_ref, strategy_id = p_strategy_id,
-      rule_config_id = p_rule_config_id, rule_version = p_rule_version,
-      owner_module = p_owner, sequence = p_sequence,
-      planned_start = p_start, planned_end = p_end, due_at = COALESCE(p_end, p_start),
-      shadow = p_shadow, payload = p_payload, status = 'planned', error = NULL, updated_at = now()
-    WHERE id = existing.id;
-    RETURN 'revised';
-  END IF;
-
-  INSERT INTO public.logistics_tasks (
-    user_id, plan_run_id, order_ref, buffer_ref, strategy_id, rule_config_id, rule_version,
-    task_type, owner_module, sequence, planned_start, planned_end, due_at, shadow, payload
-  ) VALUES (
-    p_user_id, p_run_id, p_order_ref, p_buffer_ref, p_strategy_id, p_rule_config_id, p_rule_version,
-    p_task_type, p_owner, p_sequence, p_start, p_end, COALESCE(p_end, p_start), p_shadow, p_payload
-  );
-  RETURN 'created';
-END; $function$
-$fsdef$;
-EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_upsert_task overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
-END $fsdo$;
-
-DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_valid_timezone(_tz text)
- RETURNS boolean
- LANGUAGE sql
- STABLE SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
-  SELECT EXISTS (SELECT 1 FROM pg_timezone_names n WHERE n.name = _tz)
-$function$
-$fsdef$;
-EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_valid_timezone overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
-END $fsdo$;
-
-DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_verkoop_order_link(p_order_id uuid)
- RETURNS text
- LANGUAGE plpgsql
- STABLE SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
-DECLARE v_base text; v_path text;
-BEGIN
-  IF p_order_id IS NULL THEN RETURN NULL; END IF;
-  v_base := public.logistics_shell_base_url();
-  SELECT nullif(btrim(value), '') INTO v_path FROM public.module_runtime_config WHERE key = 'verkoop_order_path' LIMIT 1;
-  IF v_base IS NULL OR v_path IS NULL OR position('{orderId}' in v_path) = 0 OR left(v_path, 1) <> '/' THEN
-    RETURN NULL;
-  END IF;
-  RETURN v_base || replace(v_path, '{orderId}', p_order_id::text);
-END $function$
-$fsdef$;
-EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_verkoop_order_link overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
-END $fsdo$;
-
-DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_working_hours_status()
- RETURNS jsonb
- LANGUAGE sql
- STABLE SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
-  SELECT jsonb_build_object(
-    'timezone', public.logistics_opening_timezone(),
-    'windows', COALESCE((SELECT jsonb_agg(jsonb_build_object('id', h.id, 'weekday', h.weekday, 'opens', h.opens, 'closes', h.closes, 'note', h.note) ORDER BY h.weekday, h.opens)
-      FROM public.logistics_opening_hours h WHERE h.is_active), '[]'::jsonb),
-    'exceptions', COALESCE((SELECT jsonb_agg(jsonb_build_object('id', e.id, 'day', e.day, 'closed', e.is_closed, 'opens', e.opens, 'closes', e.closes, 'note', e.note) ORDER BY e.day)
-      FROM public.logistics_opening_exceptions e WHERE e.day >= current_date - 7), '[]'::jsonb),
-    'usable', (public.logistics_opening_timezone() IS NOT NULL AND EXISTS (SELECT 1 FROM public.logistics_opening_hours WHERE is_active))
-  );
-$function$
-$fsdef$;
-EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_working_hours_status overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
-END $fsdo$;
-
-DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_write_buffer_layer_positions(p_buffer_id uuid)
- RETURNS integer
- LANGUAGE plpgsql
- SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
-declare c record; v_total int := 0;
-begin
-  for c in select id from logistics_active.order_carts where buffer_id = p_buffer_id loop
-    v_total := v_total + public.logistics_write_cart_layer_positions(c.id);
-  end loop;
-  return v_total;
-end;
-$function$
+AS $function$ SELECT nullif(btrim(t.timezone), '') FROM public.logistics_time_settings t ORDER BY t.updated_at DESC NULLS LAST LIMIT 1 $function$
 $fsdef$;
 EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_write_buffer_layer_positions overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
+  RAISE NOTICE 'logistiek-engine: functie public.logistics_tz overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
 END $fsdo$;
 
 DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_write_cart_layer_positions(p_cart_id uuid)
- RETURNS integer
- LANGUAGE plpgsql
- SECURITY DEFINER
+  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_unit_all_carts_scanned(p_order_id uuid)
+ RETURNS boolean
+ LANGUAGE sql
+ STABLE SECURITY DEFINER
  SET search_path TO 'public'
 AS $function$
-declare
-  v_cart record;
-  v_lc record;
-  v_layer_w numeric;
-  v_layer_h numeric;
-  v_max_layers int;
-  it record;
-  v_w numeric; v_h numeric;
-  v_layer int := 1;
-  v_x numeric := 0; v_y numeric := 0; v_row_h numeric := 0;
-  v_n int; i int;
-  v_written int := 0;
-  v_seq int := 0;
-  v_full boolean := false;
-  v_fit_a int; v_fit_b int;
-  v_kegs jsonb := '[]'::jsonb;
-  v_slots jsonb := '[]'::jsonb;
-  v_used boolean[] := '{}';
-  v_pos jsonb;
-  v_keg jsonb;
-  v_ov record;
-  v_overrides jsonb := '{}'::jsonb;
-  v_k int; v_s int; v_slot jsonb;
-  v_placed jsonb := '[]'::jsonb;
-begin
-  select * into v_cart from logistics_active.order_carts where id = p_cart_id;
-  if v_cart.id is null then return 0; end if;
-
-  if coalesce((
-    select settings->'karrenindeling'->'fields'->>'cart_layout_method'
-      from public.logistics_rule_configs
-     where is_active
-     order by updated_at desc limit 1), 'belading') <> 'afmetingen' then
-    delete from public.order_cart_layer_positions where cart_id = p_cart_id;
-    return 0;
-  end if;
-
-  select * into v_lc from public.load_carrier_types
-   where (v_cart.carrier_type_id is not null and id = v_cart.carrier_type_id)
-      or (v_cart.carrier_type_id is null and code = v_cart.carrier_type)
-   limit 1;
-  if v_lc.id is null then
-    select * into v_lc from public.load_carrier_types where is_active and is_default order by sort_order limit 1;
-  end if;
-
-  v_layer_w := nullif(v_lc.layer_width_cm, 0) * 10;
-  v_layer_h := nullif(v_lc.layer_length_cm, 0) * 10;
-  v_max_layers := greatest(1, coalesce(v_cart.max_layers, v_lc.layers_per_carrier, 1));
-
-  if v_layer_w is null or v_layer_h is null then
-    delete from public.order_cart_layer_positions where cart_id = p_cart_id;
-    return 0;
-  end if;
-
-  -- handmatige plaatsingen bewaren vóór het vervangen
-  for v_ov in
-    select keg_id, layer, x, y, width, height, rotation, manual_overridden_at, manual_overridden_by
-      from public.order_cart_layer_positions
-     where cart_id = p_cart_id and manual_override
-  loop
-    v_overrides := v_overrides || jsonb_build_object(v_ov.keg_id, jsonb_build_object(
-      'layer', v_ov.layer, 'x', v_ov.x, 'y', v_ov.y,
-      'w', v_ov.width, 'h', v_ov.height,
-      'at', v_ov.manual_overridden_at, 'by', v_ov.manual_overridden_by));
-  end loop;
-
-  -- 1. fustlijst opbouwen (stabiele volgorde, stabiele keg-namen)
-  for it in
-    select ci.id, ci.order_item_id, ci.product_id,
-           coalesce(ci.product_name, p.product) as product_name,
-           greatest(0, coalesce(ci.crates, 0)) as crates,
-           d.fust_width_mm as fw, d.fust_length_mm as fl, d.fust_name as fust_name
-      from logistics_active.order_cart_items ci
-      left join public.logistics_product_dimensions d on d.product_id = ci.product_id
-      left join public.products p on p.id = ci.product_id
-     where ci.cart_id = p_cart_id
-     order by coalesce(ci.layer_index, 999), ci.id
-  loop
-    v_n := it.crates;
-    if v_n <= 0 then continue; end if;
-    if it.fw is null or it.fl is null or it.fw <= 0 or it.fl <= 0 then continue; end if;
-
-    v_fit_a := floor(v_layer_w / it.fw) * floor(v_layer_h / it.fl);
-    v_fit_b := floor(v_layer_w / it.fl) * floor(v_layer_h / it.fw);
-    if v_fit_a >= v_fit_b then
-      v_w := it.fw; v_h := it.fl;
-    else
-      v_w := it.fl; v_h := it.fw;
-    end if;
-    if v_w > v_layer_w or v_h > v_layer_h then continue; end if;
-
-    for i in 1..v_n loop
-      v_seq := v_seq + 1;
-      v_kegs := v_kegs || jsonb_build_array(jsonb_build_object(
-        'keg', 'F' || v_seq,
-        'product_id', it.product_id,
-        'order_item_id', it.order_item_id,
-        'label', coalesce(it.product_name, 'Fust') || coalesce(' - ' || it.fust_name, ''),
-        'w', v_w, 'h', v_h));
-    end loop;
-  end loop;
-
-  -- 2. beschikbare plekken berekenen in dezelfde volgorde
-  for v_k in 0 .. jsonb_array_length(v_kegs) - 1 loop
-    v_keg := v_kegs -> v_k;
-    v_w := (v_keg->>'w')::numeric; v_h := (v_keg->>'h')::numeric;
-    if v_x + v_w > v_layer_w + 0.001 then
-      v_x := 0; v_y := v_y + v_row_h; v_row_h := 0;
-    end if;
-    if v_y + v_h > v_layer_h + 0.001 then
-      v_layer := v_layer + 1; v_x := 0; v_y := 0; v_row_h := 0;
-      if v_layer > v_max_layers then
-        v_full := true;
-        exit;
-      end if;
-    end if;
-    v_slots := v_slots || jsonb_build_array(jsonb_build_object(
-      'layer', v_layer, 'x', v_x, 'y', v_y, 'w', v_w, 'h', v_h));
-    v_used := v_used || false;
-    v_x := v_x + v_w;
-    v_row_h := greatest(v_row_h, v_h);
-  end loop;
-
-  -- 3. handmatige plekken eerst vastzetten
-  for v_k in 0 .. greatest(jsonb_array_length(v_kegs) - 1, -1) loop
-    exit when jsonb_array_length(v_kegs) = 0;
-    v_keg := v_kegs -> v_k;
-    v_pos := v_overrides -> (v_keg->>'keg');
-    if v_pos is null then continue; end if;
-    if (v_pos->>'w')::numeric is distinct from (v_keg->>'w')::numeric
-       or (v_pos->>'h')::numeric is distinct from (v_keg->>'h')::numeric then
-      insert into public.logistics_layer_override_log(cart_id, keg_id, product_id, reason, details)
-      values (p_cart_id, v_keg->>'keg', nullif(v_keg->>'product_id','')::uuid,
-              'afmeting_gewijzigd', jsonb_build_object('override', v_pos, 'nieuw', v_keg));
-      v_overrides := v_overrides - (v_keg->>'keg');
-      continue;
-    end if;
-    v_s := null;
-    for i in 0 .. jsonb_array_length(v_slots) - 1 loop
-      v_slot := v_slots -> i;
-      if not v_used[i+1]
-         and (v_slot->>'layer')::int = (v_pos->>'layer')::int
-         and (v_slot->>'x')::numeric = (v_pos->>'x')::numeric
-         and (v_slot->>'y')::numeric = (v_pos->>'y')::numeric then
-        v_s := i; exit;
-      end if;
-    end loop;
-    if v_s is null then
-      insert into public.logistics_layer_override_log(cart_id, keg_id, product_id, reason, details)
-      values (p_cart_id, v_keg->>'keg', nullif(v_keg->>'product_id','')::uuid,
-              'plek_vervallen', jsonb_build_object('override', v_pos));
-      v_overrides := v_overrides - (v_keg->>'keg');
-      continue;
-    end if;
-    v_used[v_s+1] := true;
-    v_placed := v_placed || jsonb_build_array(v_keg || jsonb_build_object(
-      'layer', (v_pos->>'layer')::int, 'x', (v_pos->>'x')::numeric, 'y', (v_pos->>'y')::numeric,
-      'manual', true, 'at', v_pos->>'at', 'by', v_pos->>'by'));
-  end loop;
-
-  -- overrides van fusten die niet meer in de kar zitten
-  for v_ov in select key from jsonb_each(v_overrides) as t(key, value) loop
-    if not exists (
-      select 1 from jsonb_array_elements(v_placed) e where e->>'keg' = v_ov.key
-    ) then
-      insert into public.logistics_layer_override_log(cart_id, keg_id, reason, details)
-      values (p_cart_id, v_ov.key, 'fust_niet_meer_in_kar', v_overrides -> v_ov.key);
-    end if;
-  end loop;
-
-  -- 4. overige fusten om de vaste plekken heen indelen
-  v_s := 0;
-  for v_k in 0 .. greatest(jsonb_array_length(v_kegs) - 1, -1) loop
-    exit when jsonb_array_length(v_kegs) = 0;
-    v_keg := v_kegs -> v_k;
-    if exists (select 1 from jsonb_array_elements(v_placed) e where e->>'keg' = v_keg->>'keg') then
-      continue;
-    end if;
-    while v_s < jsonb_array_length(v_slots) and v_used[v_s+1] loop
-      v_s := v_s + 1;
-    end loop;
-    exit when v_s >= jsonb_array_length(v_slots);
-    v_slot := v_slots -> v_s;
-    v_used[v_s+1] := true;
-    v_placed := v_placed || jsonb_build_array(v_keg || jsonb_build_object(
-      'layer', (v_slot->>'layer')::int, 'x', (v_slot->>'x')::numeric, 'y', (v_slot->>'y')::numeric,
-      'manual', false));
-  end loop;
-
-  -- 5. atomair vervangen inclusief teruggeschreven handmatige vlaggen
-  delete from public.order_cart_layer_positions where cart_id = p_cart_id;
-
-  for v_k in 0 .. greatest(jsonb_array_length(v_placed) - 1, -1) loop
-    exit when jsonb_array_length(v_placed) = 0;
-    v_keg := v_placed -> v_k;
-    insert into public.order_cart_layer_positions
-      (cart_id, layer, keg_id, x, y, width, height, rotation,
-       layer_width, layer_height, product_id, order_item_id, label,
-       source, algorithm_version, manual_override, manual_overridden_at, manual_overridden_by)
-    values
-      (p_cart_id, (v_keg->>'layer')::int, v_keg->>'keg',
-       (v_keg->>'x')::numeric, (v_keg->>'y')::numeric,
-       (v_keg->>'w')::numeric, (v_keg->>'h')::numeric, 0,
-       v_layer_w, v_layer_h,
-       nullif(v_keg->>'product_id','')::uuid,
-       nullif(v_keg->>'order_item_id','')::uuid,
-       v_keg->>'label',
-       'sql-grid-v5', 5,
-       coalesce((v_keg->>'manual')::boolean, false),
-       nullif(v_keg->>'at','')::timestamptz,
-       nullif(v_keg->>'by','')::uuid);
-    v_written := v_written + 1;
-  end loop;
-
-  -- 6. karregels volgen de werkelijke posities
-  update public.order_cart_items ci
-     set layer_index = s.min_layer,
-         crates_in_layer = s.max_per_layer
-    from (
-      select order_item_id,
-             min(layer) as min_layer,
-             max(cnt) as max_per_layer
-        from (
-          select order_item_id, layer, count(*) as cnt
-            from public.order_cart_layer_positions
-           where cart_id = p_cart_id and order_item_id is not null
-           group by order_item_id, layer
-        ) g
-       group by order_item_id
-    ) s
-   where ci.cart_id = p_cart_id and ci.order_item_id = s.order_item_id;
-
-  return v_written;
-end;
+  SELECT NOT EXISTS (SELECT 1 FROM unnest(public.logistics_unit_order_ids(p_order_id)) m
+                      WHERE NOT public.logistics_order_all_carts_scanned(m))
+     AND NOT EXISTS (SELECT 1 FROM public.orders o JOIN logistics_active.order_carts c ON c.buffer_id = o.buffer_id AND c.order_id IS NULL
+                      WHERE o.id = p_order_id AND cardinality(public.logistics_unit_order_ids(p_order_id)) > 1
+                        AND NOT public.logistics_cart_scanned(c.id))
 $function$
 $fsdef$;
 EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.logistics_write_cart_layer_positions overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
+  RAISE NOTICE 'logistiek-engine: functie public.logistics_unit_all_carts_scanned overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
 END $fsdo$;
 
 DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.pick_cart_breakdown(_order_id uuid)
- RETURNS jsonb
- LANGUAGE plpgsql
+  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_unit_order_ids(p_order_id uuid)
+ RETURNS uuid[]
+ LANGUAGE sql
  STABLE SECURITY DEFINER
  SET search_path TO 'public'
 AS $function$
-DECLARE
-  v_orders uuid[]; v_ref text; v_status jsonb;
-  v_ready boolean := false; v_released boolean := false;
-  v_total integer := 0; v_full integer := 0; v_partial integer := 0;
-  v_shared integer := 0; v_crates integer := 0;
-BEGIN
-  v_orders := public.pick_buffer_order_ids(_order_id);
-  IF v_orders IS NULL OR cardinality(v_orders) = 0 THEN v_orders := ARRAY[_order_id]; END IF;
-  SELECT o.order_number INTO v_ref FROM public.orders o WHERE o.id = _order_id;
-  v_status := public.logistics_cart_plan_status(v_ref);
-  v_ready := COALESCE((v_status->>'ready')::boolean, false);
-  v_released := COALESCE((v_status->>'released')::boolean, false);
-  IF v_ready THEN
-    v_total := COALESCE((v_status->>'cartTotal')::integer, (v_status->>'totalCarts')::integer, 0);
-    SELECT
-      count(*) FILTER (WHERE COALESCE((c->>'isFullCart')::boolean, false)),
-      count(*) FILTER (WHERE NOT COALESCE((c->>'isFullCart')::boolean, false)),
-      count(*) FILTER (WHERE COALESCE((c->>'isShared')::boolean, false))
-      INTO v_full, v_partial, v_shared
-      FROM jsonb_array_elements(COALESCE(v_status->'carts', '[]'::jsonb)) c;
-    IF v_total = 0 THEN v_total := v_full + v_partial; END IF;
-    IF v_total > 0 AND v_full + v_partial <> v_total THEN
-      v_partial := GREATEST(v_total - v_full, 0);
-    END IF;
-  END IF;
-  SELECT COALESCE(sum(ci.crates), 0)::integer INTO v_crates
-    FROM public.order_cart_items ci
-    JOIN logistics_active.order_items oi ON oi.id = ci.order_item_id
-   WHERE oi.order_id = ANY(v_orders);
-  RETURN jsonb_build_object(
-    'totalCarts', COALESCE(v_total, 0),
-    'fullCarts', COALESCE(v_full, 0),
-    'partialCarts', COALESCE(v_partial, 0),
-    'sharedCarts', COALESCE(v_shared, 0),
-    'crates', COALESCE(v_crates, 0),
-    'cartPlanReady', v_ready,
-    'cartPlanReleased', v_released,
-    'cartPlanReason', v_status->>'reason'
-  ) || public.logistics_pick_mode();
-END; $function$
+  WITH o AS (SELECT id, buffer_id FROM public.orders WHERE id = p_order_id),
+  m AS (SELECT o2.id, o2.order_number FROM o JOIN public.orders o2 ON o2.buffer_id = o.buffer_id
+         WHERE o.buffer_id IS NOT NULL AND o2.deleted_at IS NULL AND o2.cancelled_at IS NULL)
+  SELECT CASE WHEN (SELECT count(*) FROM m) > 1 THEN (SELECT array_agg(id ORDER BY order_number, id) FROM m)
+              ELSE ARRAY[p_order_id] END
+$function$
 $fsdef$;
 EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.pick_cart_breakdown overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
+  RAISE NOTICE 'logistiek-engine: functie public.logistics_unit_order_ids overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
 END $fsdo$;
 
 DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.pick_enqueue_print_job(_queue_item_id uuid, _printer_id uuid DEFAULT NULL::uuid, _session_id text DEFAULT NULL::text, _is_herprint boolean DEFAULT false)
- RETURNS uuid
+  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_upsert_task(p_user_id uuid, p_run_id uuid, p_order_ref text, p_buffer_ref text, p_strategy_id uuid, p_rule_config_id uuid, p_rule_version integer, p_task_type text, p_owner text, p_sequence integer, p_start timestamp with time zone, p_end timestamp with time zone, p_shadow boolean, p_payload jsonb)
+ RETURNS text
  LANGUAGE plpgsql
  SECURITY DEFINER
  SET search_path TO 'public'
 AS $function$
-declare
-  doc jsonb; target_printer uuid; job_id uuid; v_cart_id uuid;
-  v_doc_code text; v_plan jsonb; v_cart jsonb; v_last uuid; v_row_cart text;
-begin
-  select lower(btrim(coalesce(nullif(q.payload->>'documentType',''), nullif(t.code,''), ''))),
-         nullif(q.payload->>'cartId','')
-    into v_doc_code, v_row_cart
-    from public.pick_queue q
-    left join public.pick_document_types t on t.id = q.document_type_id
-   where q.id = _queue_item_id;
-
-  if v_doc_code = 'pakbon' then
-    -- Karregel: precies die ene kar. Orderregel: per kar één opdracht.
-    if v_row_cart is not null then
-      return public.pick_enqueue_print_job(_queue_item_id, _printer_id, _session_id,
-                                           coalesce(_is_herprint,false), v_row_cart);
-    end if;
-
-    begin
-      v_plan := public.pick_queue_cart_plan(_queue_item_id);
-    exception when others then v_plan := null; end;
-
-    if v_plan is null or jsonb_array_length(coalesce(v_plan->'carts','[]'::jsonb)) = 0 then
-      raise exception 'Het karplan voor dit document is nog niet klaar; er wordt geen pakbon zonder barcode geprint.' using errcode='check_violation';
-    end if;
-
-    for v_cart in select c from jsonb_array_elements(v_plan->'carts') as c loop
-      v_last := public.pick_enqueue_print_job(_queue_item_id, _printer_id, _session_id,
-                                              coalesce(_is_herprint,false), v_cart->>'cartId');
-    end loop;
-    return v_last;
-  end if;
-
-  doc := public.logistics_resolve_pick_document(_queue_item_id, false, _session_id, coalesce(_is_herprint,false));
-
-  if nullif(doc->>'barcode','') is not null then
-    begin v_cart_id := nullif(doc->>'cart_id','')::uuid;
-    exception when invalid_text_representation then v_cart_id := null; end;
-    if v_cart_id is not null then perform public.logistics_ensure_cart_barcode(v_cart_id); end if;
-  end if;
-
-  select p.id into target_printer from public.printers p
-   where p.id = _printer_id and p.actief and nullif(p.extern_printer_id,'') is not null;
+DECLARE existing public.logistics_tasks%ROWTYPE;
+BEGIN
+  SELECT * INTO existing FROM public.logistics_tasks
+   WHERE user_id = p_user_id AND order_ref = p_order_ref AND task_type = p_task_type
+     AND status NOT IN ('cancelled','superseded')
+   ORDER BY created_at DESC LIMIT 1;
 
-  insert into public.print_jobs(
-    printer_id, layout_id, documenttype, documentnaam, status, foutmelding,
-    payload, gebruiker_naam, pdf_url, pdf_base64, herkomst, is_herprint)
-  values (target_printer, nullif(doc->>'layout_id','')::uuid,
-    (doc->>'documenttype')::public.doc_layout_type, doc->>'documentnaam', 'wachtend',
-    nullif(doc->>'foutmelding',''), doc->'payload', 'Pickstation',
-    nullif(doc->>'pdf_url',''), nullif(doc->>'pdf_base64',''), nullif(doc->>'herkomst',''),
-    coalesce(_is_herprint,false))
-  returning id into job_id;
+  IF FOUND THEN
+    IF existing.status IN ('claimed','in_progress','done','skipped') THEN
+      RETURN 'locked';
+    END IF;
+    UPDATE public.logistics_tasks SET
+      plan_run_id = p_run_id, buffer_ref = p_buffer_ref, strategy_id = p_strategy_id,
+      rule_config_id = p_rule_config_id, rule_version = p_rule_version,
+      owner_module = p_owner, sequence = p_sequence,
+      planned_start = p_start, planned_end = p_end, due_at = COALESCE(p_end, p_start),
+      shadow = p_shadow, payload = p_payload, status = 'planned', error = NULL, updated_at = now()
+    WHERE id = existing.id;
+    RETURN 'revised';
+  END IF;
 
-  perform public.logistics_enqueue_sticker_with_slip(_queue_item_id, _printer_id, _session_id,
-    coalesce(_is_herprint,false), nullif(doc->>'cart_id',''), job_id);
-  update public.pick_queue set print_job_id = job_id where id = _queue_item_id;
+  INSERT INTO public.logistics_tasks (
+    user_id, plan_run_id, order_ref, buffer_ref, strategy_id, rule_config_id, rule_version,
+    task_type, owner_module, sequence, planned_start, planned_end, due_at, shadow, payload
+  ) VALUES (
+    p_user_id, p_run_id, p_order_ref, p_buffer_ref, p_strategy_id, p_rule_config_id, p_rule_version,
+    p_task_type, p_owner, p_sequence, p_start, p_end, COALESCE(p_end, p_start), p_shadow, p_payload
+  );
+  RETURN 'created';
+END; $function$
+$fsdef$;
+EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
+  RAISE NOTICE 'logistiek-engine: functie public.logistics_upsert_task overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
+END $fsdo$;
 
-  return job_id;
-end; $function$
+DO $fsdo$ BEGIN
+  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_valid_timezone(_tz text)
+ RETURNS boolean
+ LANGUAGE sql
+ STABLE SECURITY DEFINER
+ SET search_path TO 'public'
+AS $function$
+  SELECT EXISTS (SELECT 1 FROM pg_timezone_names n WHERE n.name = _tz)
+$function$
 $fsdef$;
 EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.pick_enqueue_print_job overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
+  RAISE NOTICE 'logistiek-engine: functie public.logistics_valid_timezone overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
 END $fsdo$;
 
 DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.pick_enqueue_print_job(_queue_item_id uuid, _printer_id uuid, _session_id text, _is_herprint boolean, _cart_id text)
- RETURNS uuid
+  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_verkoop_order_link(p_order_id uuid)
+ RETURNS text
  LANGUAGE plpgsql
- SECURITY DEFINER
+ STABLE SECURITY DEFINER
  SET search_path TO 'public'
 AS $function$
-DECLARE
-  item public.pick_queue;
-  dt public.pick_document_types;
-  doc_code text;
-  target_printer uuid;
-  target_layout uuid;
-  target_plek uuid;
-  layout_meta jsonb;
-  v_types public.doc_layout_type[];
-  doc_type public.doc_layout_type := 'vrij';
-  layout_type public.doc_layout_type;
-  pdf_url text;
-  pdf_b64 text;
-  herkomst text;
-  job_id uuid;
-  cart_plan jsonb := NULL;
-  selected_cart jsonb := NULL;
-  v_cart_uuid uuid;
-  v_barcode text;
-  v_barcode_on boolean := public.logistics_pick_barcode_enabled();
-  v_is_partial boolean := false;
-  v_sleutel text;
+DECLARE v_base text; v_path text;
 BEGIN
-  SELECT * INTO item FROM public.pick_queue WHERE id = _queue_item_id;
-  IF NOT FOUND THEN RAISE EXCEPTION 'Dit document bestaat niet meer.'; END IF;
+  IF p_order_id IS NULL THEN RETURN NULL; END IF;
+  v_base := public.logistics_shell_base_url();
+  SELECT nullif(btrim(value), '') INTO v_path FROM public.module_runtime_config WHERE key = 'verkoop_order_path' LIMIT 1;
+  IF v_base IS NULL OR v_path IS NULL OR position('{orderId}' in v_path) = 0 OR left(v_path, 1) <> '/' THEN
+    RETURN NULL;
+  END IF;
+  RETURN v_base || replace(v_path, '{orderId}', p_order_id::text);
+END $function$
+$fsdef$;
+EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
+  RAISE NOTICE 'logistiek-engine: functie public.logistics_verkoop_order_link overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
+END $fsdo$;
 
-  SELECT * INTO dt FROM public.pick_document_types WHERE id = item.document_type_id;
+DO $fsdo$ BEGIN
+  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_working_hours_status()
+ RETURNS jsonb
+ LANGUAGE sql
+ STABLE SECURITY DEFINER
+ SET search_path TO 'public'
+AS $function$
+  SELECT jsonb_build_object(
+    'timezone', public.logistics_opening_timezone(),
+    'windows', COALESCE((SELECT jsonb_agg(jsonb_build_object('id', h.id, 'weekday', h.weekday, 'opens', h.opens, 'closes', h.closes, 'note', h.note) ORDER BY h.weekday, h.opens)
+      FROM public.logistics_opening_hours h WHERE h.is_active), '[]'::jsonb),
+    'exceptions', COALESCE((SELECT jsonb_agg(jsonb_build_object('id', e.id, 'day', e.day, 'closed', e.is_closed, 'opens', e.opens, 'closes', e.closes, 'note', e.note) ORDER BY e.day)
+      FROM public.logistics_opening_exceptions e WHERE e.day >= current_date - 7), '[]'::jsonb),
+    'usable', (public.logistics_opening_timezone() IS NOT NULL AND EXISTS (SELECT 1 FROM public.logistics_opening_hours WHERE is_active))
+  );
+$function$
+$fsdef$;
+EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
+  RAISE NOTICE 'logistiek-engine: functie public.logistics_working_hours_status overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
+END $fsdo$;
 
-  doc_code := lower(btrim(coalesce(
-    nullif(item.payload->>'documentType', ''),
-    nullif(dt.code, ''),
-    ''
-  )));
+DO $fsdo$ BEGIN
+  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_write_buffer_layer_positions(p_buffer_id uuid)
+ RETURNS integer
+ LANGUAGE plpgsql
+ SECURITY DEFINER
+ SET search_path TO 'public'
+AS $function$
+declare c record; v_total int := 0;
+begin
+  for c in select id from logistics_active.order_carts where buffer_id = p_buffer_id loop
+    v_total := v_total + public.logistics_write_cart_layer_positions(c.id);
+  end loop;
+  return v_total;
+end;
+$function$
+$fsdef$;
+EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
+  RAISE NOTICE 'logistiek-engine: functie public.logistics_write_buffer_layer_positions overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
+END $fsdo$;
 
-  v_types := public.logistics_document_type_map(doc_code);
+DO $fsdo$ BEGIN
+  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_write_cart_layer_positions(p_cart_id uuid)
+ RETURNS integer
+ LANGUAGE plpgsql
+ SECURITY DEFINER
+ SET search_path TO 'public'
+AS $function$
+declare
+  v_cart record;
+  v_lc record;
+  v_layer_w numeric;
+  v_layer_h numeric;
+  v_max_layers int;
+  it record;
+  v_w numeric; v_h numeric;
+  v_layer int := 1;
+  v_x numeric := 0; v_y numeric := 0; v_row_h numeric := 0;
+  v_n int; i int;
+  v_written int := 0;
+  v_seq int := 0;
+  v_full boolean := false;
+  v_fit_a int; v_fit_b int;
+  v_kegs jsonb := '[]'::jsonb;
+  v_slots jsonb := '[]'::jsonb;
+  v_used boolean[] := '{}';
+  v_pos jsonb;
+  v_keg jsonb;
+  v_ov record;
+  v_overrides jsonb := '{}'::jsonb;
+  v_k int; v_s int; v_slot jsonb;
+  v_placed jsonb := '[]'::jsonb;
+begin
+  select * into v_cart from logistics_active.order_carts where id = p_cart_id;
+  if v_cart.id is null then return 0; end if;
 
-  IF _cart_id IS NOT NULL THEN
-    cart_plan := public.pick_queue_cart_plan(_queue_item_id);
-    SELECT c INTO selected_cart
-      FROM jsonb_array_elements(COALESCE(cart_plan->'carts', '[]'::jsonb)) AS c
-     WHERE c->>'cartId' = _cart_id
-     LIMIT 1;
+  if coalesce((
+    select settings->'karrenindeling'->'fields'->>'cart_layout_method'
+      from public.logistics_rule_configs
+     where is_active
+     order by updated_at desc limit 1), 'belading') <> 'afmetingen' then
+    delete from public.order_cart_layer_positions where cart_id = p_cart_id;
+    return 0;
+  end if;
 
-    IF selected_cart IS NULL THEN
-      RAISE EXCEPTION 'De gekozen kar bestaat niet meer in het actuele karplan.';
-    END IF;
+  select * into v_lc from public.load_carrier_types
+   where (v_cart.carrier_type_id is not null and id = v_cart.carrier_type_id)
+      or (v_cart.carrier_type_id is null and code = v_cart.carrier_type)
+   limit 1;
+  if v_lc.id is null then
+    select * into v_lc from public.load_carrier_types where is_active and is_default order by sort_order limit 1;
+  end if;
 
-    v_is_partial := NOT COALESCE((selected_cart->>'isFullCart')::boolean, false);
+  v_layer_w := nullif(v_lc.layer_width_cm, 0) * 10;
+  v_layer_h := nullif(v_lc.layer_length_cm, 0) * 10;
+  v_max_layers := greatest(1, coalesce(v_cart.max_layers, v_lc.layers_per_carrier, 1));
 
-    IF v_barcode_on THEN
-      BEGIN
-        v_cart_uuid := nullif(_cart_id, '')::uuid;
-      EXCEPTION WHEN invalid_text_representation THEN
-        v_cart_uuid := NULL;
-      END;
-      IF v_cart_uuid IS NOT NULL THEN
-        v_barcode := public.logistics_ensure_cart_barcode(v_cart_uuid);
-        selected_cart := selected_cart || jsonb_build_object('barcode', v_barcode);
-      END IF;
-    END IF;
-  END IF;
+  if v_layer_w is null or v_layer_h is null then
+    delete from public.order_cart_layer_positions where cart_id = p_cart_id;
+    return 0;
+  end if;
 
-  BEGIN
-    target_layout := nullif(coalesce(
-      item.payload->'layout'->>'layout_id',
-      item.payload->>'layout_id'
-    ), '')::uuid;
-  EXCEPTION WHEN invalid_text_representation THEN
-    target_layout := NULL;
-  END;
+  -- handmatige plaatsingen bewaren vóór het vervangen
+  for v_ov in
+    select keg_id, layer, x, y, width, height, rotation, manual_overridden_at, manual_overridden_by
+      from public.order_cart_layer_positions
+     where cart_id = p_cart_id and manual_override
+  loop
+    v_overrides := v_overrides || jsonb_build_object(v_ov.keg_id, jsonb_build_object(
+      'layer', v_ov.layer, 'x', v_ov.x, 'y', v_ov.y,
+      'w', v_ov.width, 'h', v_ov.height,
+      'at', v_ov.manual_overridden_at, 'by', v_ov.manual_overridden_by));
+  end loop;
 
-  IF target_layout IS NULL AND doc_code <> '' THEN
-    layout_meta := public.logistics_document_layout_v2(doc_code, v_is_partial);
-    BEGIN
-      target_layout := nullif(layout_meta->>'layout_id', '')::uuid;
-    EXCEPTION WHEN invalid_text_representation THEN
-      target_layout := NULL;
-    END;
-  END IF;
+  -- 1. fustlijst opbouwen (stabiele volgorde, stabiele keg-namen)
+  for it in
+    select ci.id, ci.order_item_id, ci.product_id,
+           coalesce(ci.product_name, p.product) as product_name,
+           greatest(0, coalesce(ci.crates, 0)) as crates,
+           d.fust_width_mm as fw, d.fust_length_mm as fl, d.fust_name as fust_name
+      from logistics_active.order_cart_items ci
+      left join public.logistics_product_dimensions d on d.product_id = ci.product_id
+      left join public.products p on p.id = ci.product_id
+     where ci.cart_id = p_cart_id
+     order by coalesce(ci.layer_index, 999), ci.id
+  loop
+    v_n := it.crates;
+    if v_n <= 0 then continue; end if;
+    if it.fw is null or it.fl is null or it.fw <= 0 or it.fl <= 0 then continue; end if;
 
-  SELECT l.documenttype INTO layout_type
-    FROM public.document_layouts l
-   WHERE l.id = target_layout
-     AND l.actief IS TRUE;
+    v_fit_a := floor(v_layer_w / it.fw) * floor(v_layer_h / it.fl);
+    v_fit_b := floor(v_layer_w / it.fl) * floor(v_layer_h / it.fw);
+    if v_fit_a >= v_fit_b then
+      v_w := it.fw; v_h := it.fl;
+    else
+      v_w := it.fl; v_h := it.fw;
+    end if;
+    if v_w > v_layer_w or v_h > v_layer_h then continue; end if;
 
-  IF layout_type IS NULL THEN
-    target_layout := NULL;
-  END IF;
+    for i in 1..v_n loop
+      v_seq := v_seq + 1;
+      v_kegs := v_kegs || jsonb_build_array(jsonb_build_object(
+        'keg', 'F' || v_seq,
+        'product_id', it.product_id,
+        'order_item_id', it.order_item_id,
+        'label', coalesce(it.product_name, 'Fust') || coalesce(' - ' || it.fust_name, ''),
+        'w', v_w, 'h', v_h));
+    end loop;
+  end loop;
 
-  doc_type := COALESCE(layout_type, v_types[1], 'vrij');
+  -- 2. beschikbare plekken berekenen in dezelfde volgorde
+  for v_k in 0 .. jsonb_array_length(v_kegs) - 1 loop
+    v_keg := v_kegs -> v_k;
+    v_w := (v_keg->>'w')::numeric; v_h := (v_keg->>'h')::numeric;
+    if v_x + v_w > v_layer_w + 0.001 then
+      v_x := 0; v_y := v_y + v_row_h; v_row_h := 0;
+    end if;
+    if v_y + v_h > v_layer_h + 0.001 then
+      v_layer := v_layer + 1; v_x := 0; v_y := 0; v_row_h := 0;
+      if v_layer > v_max_layers then
+        v_full := true;
+        exit;
+      end if;
+    end if;
+    v_slots := v_slots || jsonb_build_array(jsonb_build_object(
+      'layer', v_layer, 'x', v_x, 'y', v_y, 'w', v_w, 'h', v_h));
+    v_used := v_used || false;
+    v_x := v_x + v_w;
+    v_row_h := greatest(v_row_h, v_h);
+  end loop;
 
-  IF item.station_id IS NOT NULL THEN
-    SELECT k.print_plek_id INTO target_plek
-      FROM public.print_plek_koppelingen k
-     WHERE k.bron IN ('pickstation', 'pick_station')
-       AND k.bron_id = item.station_id::text
-     ORDER BY k.created_at
-     LIMIT 1;
-  END IF;
+  -- 3. handmatige plekken eerst vastzetten
+  for v_k in 0 .. greatest(jsonb_array_length(v_kegs) - 1, -1) loop
+    exit when jsonb_array_length(v_kegs) = 0;
+    v_keg := v_kegs -> v_k;
+    v_pos := v_overrides -> (v_keg->>'keg');
+    if v_pos is null then continue; end if;
+    if (v_pos->>'w')::numeric is distinct from (v_keg->>'w')::numeric
+       or (v_pos->>'h')::numeric is distinct from (v_keg->>'h')::numeric then
+      insert into public.logistics_layer_override_log(cart_id, keg_id, product_id, reason, details)
+      values (p_cart_id, v_keg->>'keg', nullif(v_keg->>'product_id','')::uuid,
+              'afmeting_gewijzigd', jsonb_build_object('override', v_pos, 'nieuw', v_keg));
+      v_overrides := v_overrides - (v_keg->>'keg');
+      continue;
+    end if;
+    v_s := null;
+    for i in 0 .. jsonb_array_length(v_slots) - 1 loop
+      v_slot := v_slots -> i;
+      if not v_used[i+1]
+         and (v_slot->>'layer')::int = (v_pos->>'layer')::int
+         and (v_slot->>'x')::numeric = (v_pos->>'x')::numeric
+         and (v_slot->>'y')::numeric = (v_pos->>'y')::numeric then
+        v_s := i; exit;
+      end if;
+    end loop;
+    if v_s is null then
+      insert into public.logistics_layer_override_log(cart_id, keg_id, product_id, reason, details)
+      values (p_cart_id, v_keg->>'keg', nullif(v_keg->>'product_id','')::uuid,
+              'plek_vervallen', jsonb_build_object('override', v_pos));
+      v_overrides := v_overrides - (v_keg->>'keg');
+      continue;
+    end if;
+    v_used[v_s+1] := true;
+    v_placed := v_placed || jsonb_build_array(v_keg || jsonb_build_object(
+      'layer', (v_pos->>'layer')::int, 'x', (v_pos->>'x')::numeric, 'y', (v_pos->>'y')::numeric,
+      'manual', true, 'at', v_pos->>'at', 'by', v_pos->>'by'));
+  end loop;
 
-  SELECT p.id INTO target_printer
-    FROM public.printers p
-   WHERE p.id = _printer_id
-     AND p.actief
-     AND nullif(p.extern_printer_id, '') IS NOT NULL;
+  -- overrides van fusten die niet meer in de kar zitten
+  for v_ov in select key from jsonb_each(v_overrides) as t(key, value) loop
+    if not exists (
+      select 1 from jsonb_array_elements(v_placed) e where e->>'keg' = v_ov.key
+    ) then
+      insert into public.logistics_layer_override_log(cart_id, keg_id, reason, details)
+      values (p_cart_id, v_ov.key, 'fust_niet_meer_in_kar', v_overrides -> v_ov.key);
+    end if;
+  end loop;
 
-  pdf_url := nullif(item.payload->>'pdf_url', '');
-  pdf_b64 := nullif(item.payload->>'pdf_base64', '');
-  herkomst := nullif(item.payload->>'herkomst', '');
+  -- 4. overige fusten om de vaste plekken heen indelen
+  v_s := 0;
+  for v_k in 0 .. greatest(jsonb_array_length(v_kegs) - 1, -1) loop
+    exit when jsonb_array_length(v_kegs) = 0;
+    v_keg := v_kegs -> v_k;
+    if exists (select 1 from jsonb_array_elements(v_placed) e where e->>'keg' = v_keg->>'keg') then
+      continue;
+    end if;
+    while v_s < jsonb_array_length(v_slots) and v_used[v_s+1] loop
+      v_s := v_s + 1;
+    end loop;
+    exit when v_s >= jsonb_array_length(v_slots);
+    v_slot := v_slots -> v_s;
+    v_used[v_s+1] := true;
+    v_placed := v_placed || jsonb_build_array(v_keg || jsonb_build_object(
+      'layer', (v_slot->>'layer')::int, 'x', (v_slot->>'x')::numeric, 'y', (v_slot->>'y')::numeric,
+      'manual', false));
+  end loop;
 
-  -- Ontdubbeling per kar (M8): eigen sleutel, behalve bij een herprint (die krijgt van de trigger een unieke sleutel).
-  IF NOT COALESCE(_is_herprint, false) AND _cart_id IS NOT NULL THEN
-    v_sleutel := 'pakbon:' || item.id::text || ':' || _cart_id || ':'
-              || coalesce(target_layout::text, '-') || ':' || coalesce(target_printer::text, '-');
-  END IF;
+  -- 5. atomair vervangen inclusief teruggeschreven handmatige vlaggen
+  delete from public.order_cart_layer_positions where cart_id = p_cart_id;
 
-  INSERT INTO public.print_jobs(
-    printer_id, layout_id, documenttype, documentnaam, status, foutmelding,
-    payload, gebruiker_naam, pdf_url, pdf_base64, herkomst, is_herprint, idempotentie_sleutel
-  )
-  VALUES (
-    target_printer,
-    target_layout,
-    doc_type,
-    COALESCE(item.document_number, 'Pickdocument'),
-    'wachtend',
-    CASE
-      WHEN target_layout IS NULL AND pdf_url IS NULL AND pdf_b64 IS NULL
-        THEN 'Geen actieve layout gevonden voor documentsoort "' || COALESCE(nullif(doc_code, ''), 'onbekend') || '". Maak een layout aan in de Layout maker of koppel er een in de Logistiek Engine.'
-      ELSE NULL
-    END,
-    jsonb_build_object(
-      'source', 'pickstation',
-      'queue_item_id', item.id,
-      'station_id', item.station_id,
-      'print_plek_id', target_plek,
-      'session_id', _session_id,
-      'is_herprint', COALESCE(_is_herprint, false),
-      'document_number', item.document_number,
-      'document_type_code', COALESCE(nullif(doc_code, ''), dt.code),
-      'report_key', dt.report_key,
-      'print_template', dt.print_template,
-      'order_number', COALESCE(selected_cart->>'orderNumber', item.order_number),
-      'customer_name', item.customer_name,
-      'reference', item.reference,
-      'layout_id', target_layout,
-      'layout_variant', CASE WHEN v_is_partial THEN 'partial_order' ELSE 'full_cart' END,
-      'barcode', CASE WHEN v_barcode_on THEN COALESCE(v_barcode, item.barcode) ELSE item.barcode END,
-      'country_code', item.country_code,
-      'cart_id', _cart_id,
-      'cart', selected_cart,
-      'data', COALESCE(item.payload, '{}'::jsonb) || jsonb_build_object(
-        'print_plek_id', target_plek,
-        'cart_id', _cart_id,
-        'cart', selected_cart,
-        'orderId', COALESCE(selected_cart->>'orderId', item.payload->>'orderId'),
-        'orderNumber', COALESCE(selected_cart->>'orderNumber', item.order_number)
-      )
-    ),
-    'Pickstation',
-    pdf_url,
-    pdf_b64,
-    herkomst,
-    COALESCE(_is_herprint, false),
-    v_sleutel
-  )
-  RETURNING id INTO job_id;
+  for v_k in 0 .. greatest(jsonb_array_length(v_placed) - 1, -1) loop
+    exit when jsonb_array_length(v_placed) = 0;
+    v_keg := v_placed -> v_k;
+    insert into public.order_cart_layer_positions
+      (cart_id, layer, keg_id, x, y, width, height, rotation,
+       layer_width, layer_height, product_id, order_item_id, label,
+       source, algorithm_version, manual_override, manual_overridden_at, manual_overridden_by)
+    values
+      (p_cart_id, (v_keg->>'layer')::int, v_keg->>'keg',
+       (v_keg->>'x')::numeric, (v_keg->>'y')::numeric,
+       (v_keg->>'w')::numeric, (v_keg->>'h')::numeric, 0,
+       v_layer_w, v_layer_h,
+       nullif(v_keg->>'product_id','')::uuid,
+       nullif(v_keg->>'order_item_id','')::uuid,
+       v_keg->>'label',
+       'sql-grid-v5', 5,
+       coalesce((v_keg->>'manual')::boolean, false),
+       nullif(v_keg->>'at','')::timestamptz,
+       nullif(v_keg->>'by','')::uuid);
+    v_written := v_written + 1;
+  end loop;
 
-  PERFORM public.logistics_enqueue_sticker_with_slip(_queue_item_id, _printer_id, _session_id, COALESCE(_is_herprint,false), _cart_id, job_id);
-  UPDATE public.pick_queue SET print_job_id = job_id WHERE id = _queue_item_id;
+  -- 6. karregels volgen de werkelijke posities
+  update public.order_cart_items ci
+     set layer_index = s.min_layer,
+         crates_in_layer = s.max_per_layer
+    from (
+      select order_item_id,
+             min(layer) as min_layer,
+             max(cnt) as max_per_layer
+        from (
+          select order_item_id, layer, count(*) as cnt
+            from public.order_cart_layer_positions
+           where cart_id = p_cart_id and order_item_id is not null
+           group by order_item_id, layer
+        ) g
+       group by order_item_id
+    ) s
+   where ci.cart_id = p_cart_id and ci.order_item_id = s.order_item_id;
 
-  RETURN job_id;
-END;
+  return v_written;
+end;
 $function$
 $fsdef$;
 EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.pick_enqueue_print_job overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
+  RAISE NOTICE 'logistiek-engine: functie public.logistics_write_cart_layer_positions overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
+END $fsdo$;
+
+DO $fsdo$ BEGIN
+  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.pick_cart_breakdown(_order_id uuid)
+ RETURNS jsonb
+ LANGUAGE plpgsql
+ STABLE SECURITY DEFINER
+ SET search_path TO 'public'
+AS $function$
+DECLARE
+  v_orders uuid[]; v_ref text; v_status jsonb;
+  v_ready boolean := false; v_released boolean := false;
+  v_total integer := 0; v_full integer := 0; v_partial integer := 0;
+  v_shared integer := 0; v_crates integer := 0;
+BEGIN
+  v_orders := public.pick_buffer_order_ids(_order_id);
+  IF v_orders IS NULL OR cardinality(v_orders) = 0 THEN v_orders := ARRAY[_order_id]; END IF;
+  SELECT o.order_number INTO v_ref FROM public.orders o WHERE o.id = _order_id;
+  v_status := public.logistics_cart_plan_status(v_ref);
+  v_ready := COALESCE((v_status->>'ready')::boolean, false);
+  v_released := COALESCE((v_status->>'released')::boolean, false);
+  IF v_ready THEN
+    v_total := COALESCE((v_status->>'cartTotal')::integer, (v_status->>'totalCarts')::integer, 0);
+    SELECT
+      count(*) FILTER (WHERE COALESCE((c->>'isFullCart')::boolean, false)),
+      count(*) FILTER (WHERE NOT COALESCE((c->>'isFullCart')::boolean, false)),
+      count(*) FILTER (WHERE COALESCE((c->>'isShared')::boolean, false))
+      INTO v_full, v_partial, v_shared
+      FROM jsonb_array_elements(COALESCE(v_status->'carts', '[]'::jsonb)) c;
+    IF v_total = 0 THEN v_total := v_full + v_partial; END IF;
+    IF v_total > 0 AND v_full + v_partial <> v_total THEN
+      v_partial := GREATEST(v_total - v_full, 0);
+    END IF;
+  END IF;
+  SELECT COALESCE(sum(ci.crates), 0)::integer INTO v_crates
+    FROM public.order_cart_items ci
+    JOIN logistics_active.order_items oi ON oi.id = ci.order_item_id
+   WHERE oi.order_id = ANY(v_orders);
+  RETURN jsonb_build_object(
+    'totalCarts', COALESCE(v_total, 0),
+    'fullCarts', COALESCE(v_full, 0),
+    'partialCarts', COALESCE(v_partial, 0),
+    'sharedCarts', COALESCE(v_shared, 0),
+    'crates', COALESCE(v_crates, 0),
+    'cartPlanReady', v_ready,
+    'cartPlanReleased', v_released,
+    'cartPlanReason', v_status->>'reason'
+  ) || public.logistics_pick_mode();
+END; $function$
+$fsdef$;
+EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
+  RAISE NOTICE 'logistiek-engine: functie public.pick_cart_breakdown overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
 END $fsdo$;
 
+
+
 DO $fsdo$ BEGIN
   EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.pick_queue_apply_cart_breakdown()
  RETURNS trigger
@@ -25056,311 +23506,22 @@ BEGIN
   r := public.pick_queue_cart_plan_v152(_queue_item_id);
   IF nullif(r->>'rowCartId','') IS NOT NULL THEN
     SELECT e INTO v_own FROM jsonb_array_elements(r->'carts') e WHERE e->>'cartId' = r->>'rowCartId' LIMIT 1;
-  END IF;
-  RETURN r || jsonb_build_object(
-    'cartCrates', CASE WHEN v_own IS NOT NULL THEN v_own->'cartCrates' END,
-    'bufferCrates', CASE WHEN v_own IS NOT NULL THEN v_own->'bufferCrates' END,
-    'departureAt', CASE WHEN v_own IS NOT NULL THEN v_own->'departureAt' END,
-    'pickStartsAt', CASE WHEN v_own IS NOT NULL THEN v_own->'pickStartsAt' END,
-    'releaseAt', CASE WHEN v_own IS NOT NULL THEN v_own->'releaseAt' END,
-    'releaseReason', CASE WHEN v_own IS NOT NULL THEN v_own->'releaseReason' END);
-END $function$
-$fsdef$;
-EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.pick_queue_cart_plan overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
-END $fsdo$;
-
-DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.recompute_all_reserved_stock()
- RETURNS void
- LANGUAGE plpgsql
- SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
-DECLARE
-  oi_rec record; part record; member_rec record;
-  v_key text; v_last_key text; v_remaining numeric; v_available numeric; v_take numeric; v_err text;
-  v_skipped jsonb := '[]'::jsonb; v_skipped_qty numeric := 0;
-  v_struct jsonb := '[]'::jsonb; v_struct_qty numeric := 0;
-  v_frozen_ids uuid[];
-BEGIN
-  IF current_setting('app.recomputing_reserved', true) = 'on' THEN RETURN; END IF;
-  PERFORM set_config('app.recomputing_reserved', 'on', true);
-
-  DROP TABLE IF EXISTS _reserved_keys;
-  DROP TABLE IF EXISTS _reserved_demand;
-  DROP TABLE IF EXISTS _reserved_line;
-  DROP TABLE IF EXISTS _reserved_alloc;
-  DROP TABLE IF EXISTS _reserved_frozen;
-  DROP TABLE IF EXISTS _reserved_double;
-  CREATE TEMP TABLE _reserved_keys (raw_key text PRIMARY KEY, canon_key text) ON COMMIT DROP;
-  CREATE TEMP TABLE _reserved_demand (trade_item_key text PRIMARY KEY, qty numeric NOT NULL DEFAULT 0) ON COMMIT DROP;
-  CREATE TEMP TABLE _reserved_line (kind text, ref text, qty numeric, note text) ON COMMIT DROP;
-  CREATE TEMP TABLE _reserved_alloc (order_item_id uuid, trade_item_key text, qty numeric, source text, group_id uuid) ON COMMIT DROP;
-  CREATE TEMP TABLE _reserved_frozen (order_item_id uuid PRIMARY KEY) ON COMMIT DROP;
-  CREATE TEMP TABLE _reserved_double (order_item_id uuid PRIMARY KEY) ON COMMIT DROP;
-
-  INSERT INTO _reserved_double SELECT DISTINCT d.order_item_id FROM public.logistics_double_group_lines(NULL) d;
-
-  IF public.logistics_plan_setting('verdeling_bevriezen_actief', 0) = 1 THEN
-    INSERT INTO _reserved_frozen
-    SELECT oi.id
-      FROM logistics_active.order_items oi
-      JOIN public.orders o ON o.id = oi.order_id
-     WHERE o.status = 'Nog te picken' AND NOT public.logistics_reserved_order_excluded(o.id)
-       AND COALESCE(oi.quantity, 0) > 0
-       AND oi.product_id IS NOT NULL
-       AND NOT EXISTS (SELECT 1 FROM _reserved_double x WHERE x.order_item_id = oi.id)
-       AND NOT EXISTS (SELECT 1 FROM public.stock_mutation_log sml WHERE sml.order_item_id = oi.id AND sml.mutation_type = 'consumption')
-       AND EXISTS (SELECT 1 FROM public.logistics_reservation_allocations a WHERE a.order_item_id = oi.id AND a.source <> 'error')
-       AND public.logistics_allocation_frozen(oi.order_id)
-    ON CONFLICT DO NOTHING;
-
-    -- Bevroren verdeling eerst, naar rato van het huidige aantal (verlaging geeft reservering vrij).
-    INSERT INTO _reserved_alloc
-    SELECT f.order_item_id, s.trade_item_key, s.qty, s.source, s.group_id
-      FROM _reserved_frozen f
-      JOIN logistics_active.order_items oi ON oi.id = f.order_item_id
-      CROSS JOIN LATERAL public.logistics_frozen_allocation_scaled(f.order_item_id, COALESCE(oi.quantity, 0)::numeric) s;
-    INSERT INTO _reserved_demand AS d
-    SELECT trade_item_key, SUM(qty) FROM _reserved_alloc GROUP BY trade_item_key
-    ON CONFLICT (trade_item_key) DO UPDATE SET qty = d.qty + EXCLUDED.qty;
-  END IF;
-
-  FOR oi_rec IN
-    SELECT oi.id, oi.product_id, COALESCE(oi.quantity, 0)::numeric AS quantity
-      FROM logistics_active.order_items oi
-      JOIN public.orders o ON o.id = oi.order_id
-     WHERE o.status = 'Nog te picken' AND NOT public.logistics_reserved_order_excluded(o.id)
-       AND COALESCE(oi.quantity, 0) > 0
-       AND oi.product_id IS NOT NULL
-       AND NOT EXISTS (SELECT 1 FROM public.stock_mutation_log sml WHERE sml.order_item_id = oi.id AND sml.mutation_type = 'consumption')
-       AND NOT EXISTS (SELECT 1 FROM _reserved_frozen f WHERE f.order_item_id = oi.id)
-       AND NOT EXISTS (SELECT 1 FROM _reserved_double x WHERE x.order_item_id = oi.id)
-     ORDER BY o.created_at, oi.id
-  LOOP
-    DELETE FROM _reserved_line WHERE true;  -- safeupdate: nooit DELETE zonder WHERE
-    INSERT INTO _reserved_line SELECT * FROM public.logistics_expand_line(oi_rec.product_id, oi_rec.quantity);
-
-    SELECT string_agg(l.note, '; ') INTO v_err FROM _reserved_line l WHERE l.kind = 'error';
-    IF v_err IS NOT NULL THEN
-      v_struct := v_struct || jsonb_build_object('order_item_id', oi_rec.id, 'product_id', oi_rec.product_id, 'reden', v_err);
-      v_struct_qty := v_struct_qty + oi_rec.quantity;
-      CONTINUE;
-    END IF;
-
-    FOR part IN SELECT l.kind, l.ref, l.qty FROM _reserved_line l LOOP
-      IF part.kind = 'item' THEN
-        IF NOT EXISTS (SELECT 1 FROM _reserved_keys WHERE raw_key = part.ref) THEN
-          INSERT INTO _reserved_keys VALUES (part.ref, public.logistics_reserved_key(part.ref));
-        END IF;
-        SELECT canon_key INTO v_key FROM _reserved_keys WHERE raw_key = part.ref;
-        IF v_key IS NULL THEN
-          v_skipped := v_skipped || to_jsonb(part.ref);
-          v_skipped_qty := v_skipped_qty + part.qty;
-        ELSE
-          INSERT INTO _reserved_demand AS d VALUES (v_key, part.qty)
-            ON CONFLICT (trade_item_key) DO UPDATE SET qty = d.qty + EXCLUDED.qty;
-          INSERT INTO _reserved_alloc VALUES (oi_rec.id, v_key, part.qty, 'item', NULL);
-        END IF;
-      ELSE
-        v_remaining := part.qty;
-        v_last_key := NULL;
-        FOR member_rec IN
-          SELECT public.resolve_group_member_stock_key(pgi.trade_item_id) AS raw_key
-            FROM public.product_group_items pgi
-           WHERE pgi.product_group_id = part.ref::uuid
-             AND public.resolve_group_member_stock_key(pgi.trade_item_id) IS NOT NULL
-             AND public.resolve_group_member_stock_key(pgi.trade_item_id) NOT LIKE 'group:%'
-           ORDER BY pgi.sort_order ASC NULLS LAST, pgi.created_at ASC, pgi.id ASC
-        LOOP
-          IF NOT EXISTS (SELECT 1 FROM _reserved_keys WHERE raw_key = member_rec.raw_key) THEN
-            INSERT INTO _reserved_keys VALUES (member_rec.raw_key, public.logistics_reserved_key(member_rec.raw_key));
-          END IF;
-          SELECT canon_key INTO v_key FROM _reserved_keys WHERE raw_key = member_rec.raw_key;
-          IF v_key IS NULL THEN CONTINUE; END IF;
-          v_last_key := v_key;
-          IF v_remaining <= 0 THEN CONTINUE; END IF;
-
-          SELECT GREATEST(COALESCE(MAX(s.physical_stock), 0)
-                          - COALESCE((SELECT d.qty FROM _reserved_demand d WHERE d.trade_item_key = v_key), 0), 0)
-            INTO v_available
-            FROM public.trade_item_stock s
-           WHERE s.trade_item_key = v_key;
-
-          IF COALESCE(v_available, 0) <= 0 THEN CONTINUE; END IF;
-          v_take := LEAST(v_available, v_remaining);
-          INSERT INTO _reserved_demand AS d VALUES (v_key, v_take)
-            ON CONFLICT (trade_item_key) DO UPDATE SET qty = d.qty + EXCLUDED.qty;
-          INSERT INTO _reserved_alloc VALUES (oi_rec.id, v_key, v_take, 'group', part.ref::uuid);
-          v_remaining := v_remaining - v_take;
-        END LOOP;
-
-        IF v_remaining > 0 THEN
-          IF v_last_key IS NULL THEN
-            v_skipped := v_skipped || to_jsonb('group:' || part.ref);
-            v_skipped_qty := v_skipped_qty + v_remaining;
-          ELSE
-            INSERT INTO _reserved_demand AS d VALUES (v_last_key, v_remaining)
-              ON CONFLICT (trade_item_key) DO UPDATE SET qty = d.qty + EXCLUDED.qty;
-            INSERT INTO _reserved_alloc VALUES (oi_rec.id, v_last_key, v_remaining, 'group', part.ref::uuid);
-          END IF;
-        END IF;
-      END IF;
-    END LOOP;
-  END LOOP;
-
-  DELETE FROM public.logistics_reservation_allocations a
-   WHERE a.order_item_id IN (
-     SELECT oi.id FROM logistics_active.order_items oi
-       JOIN public.orders o ON o.id = oi.order_id
-      WHERE o.status = 'Nog te picken' AND NOT public.logistics_reserved_order_excluded(o.id)
-        AND NOT EXISTS (SELECT 1 FROM public.stock_mutation_log sml
-                         WHERE sml.order_item_id = oi.id AND sml.mutation_type = 'consumption'));
-  INSERT INTO public.logistics_reservation_allocations (order_item_id, trade_item_key, qty, source, group_id, line_qty)
-  SELECT r.order_item_id, r.trade_item_key, SUM(r.qty), r.source, r.group_id, MAX(COALESCE(oi.quantity, 0))::numeric
-    FROM _reserved_alloc r
-    LEFT JOIN logistics_active.order_items oi ON oi.id = r.order_item_id
-   WHERE r.qty > 0
-   GROUP BY r.order_item_id, r.trade_item_key, r.source, r.group_id;
-  DELETE FROM public.logistics_reservation_allocations WHERE computed_at < now() - interval '90 days';
-
-  PERFORM set_config('stock.change_source', 'RESERVATION_RECOMPUTE', true);
-  UPDATE public.trade_item_stock s
-     SET reserved_stock = CEIL(COALESCE(d.qty, 0))::integer,
-         change_source  = 'RESERVATION_RECOMPUTE',
-         updated_at     = now()
-    FROM public.trade_item_stock s2
-    LEFT JOIN _reserved_demand d ON d.trade_item_key = s2.trade_item_key
-   WHERE s2.id = s.id
-     AND s.reserved_stock IS DISTINCT FROM CEIL(COALESCE(d.qty, 0))::integer;
-
-  IF jsonb_array_length(v_skipped) > 0 THEN
-    PERFORM public.logistics_trace(jsonb_build_object(
-      'phase', 'reservering', 'step', 'reservering herberekenen', 'status', 'waarschuwing',
-      'actor', 'recompute_all_reserved_stock', 'errorClass', 'ontbrekende_gegevens',
-      'reason', 'Geen voorraadrij en geen actieve Floriday-koppeling om die aan te maken; reservering voor deze artikelen niet berekend.',
-      'values', jsonb_build_object(
-        'aantal_sleutels', (SELECT count(DISTINCT x) FROM jsonb_array_elements_text(v_skipped) x),
-        'sleutels', (SELECT jsonb_agg(DISTINCT x) FROM jsonb_array_elements_text(v_skipped) x),
-        'gemiste_vraag_stuks', v_skipped_qty)));
-  END IF;
-
-  IF jsonb_array_length(v_struct) > 0 THEN
-    PERFORM public.logistics_trace(jsonb_build_object(
-      'phase', 'reservering', 'step', 'reservering herberekenen', 'status', 'waarschuwing',
-      'actor', 'recompute_all_reserved_stock', 'errorClass', 'structuur',
-      'reason', 'Samenstelling met een lus of te diepe nesting; voor deze bestelregels is niets gereserveerd.',
-      'values', jsonb_build_object('aantal_regels', jsonb_array_length(v_struct), 'regels', v_struct, 'gemiste_vraag_stuks', v_struct_qty)));
-  END IF;
-
-  SELECT array_agg(order_item_id) INTO v_frozen_ids FROM _reserved_frozen;
-  PERFORM public.logistics_report_frozen_shortage(v_frozen_ids);
-  PERFORM public.logistics_allocation_check_changes(NULL);
-
-  PERFORM set_config('app.recomputing_reserved', 'off', true);
-END;
-$function$
-$fsdef$;
-EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.recompute_all_reserved_stock overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
-END $fsdo$;
-
-DO $fsdo$ BEGIN
-  EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.recompute_reserved_stock(p_trade_item_key text)
- RETURNS void
- LANGUAGE plpgsql
- SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
-DECLARE
-  v_key text;
-  v_sum integer;
-  v_products uuid[];
-  v_pid uuid;
-BEGIN
-  IF p_trade_item_key IS NULL OR btrim(p_trade_item_key) = '' THEN RETURN; END IF;
-  IF current_setting('app.recomputing_reserved', true) = 'on' THEN RETURN; END IF;
-
-  -- B1: nieuwe of losse sleutel zonder orderregels, toewijzing of set-/groepsrelatie en reservering 0: niets te doen.
-  v_key := public.logistics_reserved_key(p_trade_item_key);
-  IF public.logistics_reserved_fast_skip(p_trade_item_key, v_key) THEN RETURN; END IF;
-
-  -- Set of groepshoofdproduct: gericht herberekenen op de onderdelen en leden (M7).
-  SELECT array_agg(p.id) INTO v_products
-    FROM public.products p
-   WHERE (p.trade_item_key = btrim(p_trade_item_key)
-          OR p.floriday_trade_item_id = btrim(p_trade_item_key)
-          OR p.id::text = btrim(p_trade_item_key))
-     AND (EXISTS (SELECT 1 FROM public.product_bom_items b WHERE b.parent_product_id = p.id)
-          OR EXISTS (SELECT 1 FROM public.product_groups pg
-                      WHERE pg.is_active = true AND (pg.id = p.id OR pg.head_product_id = p.id)));
-  IF v_products IS NOT NULL THEN
-    FOREACH v_pid IN ARRAY v_products LOOP
-      PERFORM public.logistics_recompute_reserved_targeted(v_pid);
-    END LOOP;
-    RETURN;
-  END IF;
-
-  IF v_key IS NULL THEN
-    PERFORM public.logistics_trace(jsonb_build_object(
-      'phase', 'reservering',
-      'step', 'reservering herberekenen',
-      'status', 'waarschuwing',
-      'actor', 'recompute_reserved_stock',
-      'errorClass', 'ontbrekende_gegevens',
-      'reason', 'Geen voorraadrij en geen actieve Floriday-koppeling om die aan te maken; reservering niet berekend.',
-      'values', jsonb_build_object('sleutel', btrim(p_trade_item_key))));
-    RETURN;
-  END IF;
-
-  -- Sleutel hoort bij een groep of samenstelling: de toewijzing hangt van andere
-  -- regels af, dus volledig herberekenen.
-  IF v_key LIKE 'group:%'
-     OR EXISTS (SELECT 1 FROM public.logistics_reservation_allocations a
-                 WHERE a.trade_item_key = v_key AND a.source = 'group')
-     OR EXISTS (SELECT 1 FROM public.product_group_items pgi
-                  JOIN public.product_groups pg ON pg.id = pgi.product_group_id AND pg.is_active = true
-                 WHERE public.resolve_group_member_stock_key(pgi.trade_item_id) IN (v_key, btrim(p_trade_item_key)))
-     OR EXISTS (SELECT 1 FROM public.product_bom_items b
-                  JOIN public.products p ON p.id = b.component_product_id
-                 WHERE COALESCE(NULLIF(btrim(COALESCE(p.floriday_trade_item_id, '')), ''),
-                                NULLIF(btrim(COALESCE(p.trade_item_key, '')), ''), p.id::text) = v_key
-                    OR p.trade_item_key = btrim(p_trade_item_key))
-  THEN
-    PERFORM public.recompute_all_reserved_stock();
-    RETURN;
-  END IF;
-
-  SELECT CEIL(COALESCE(SUM(COALESCE(oi.quantity, 0)), 0))::integer INTO v_sum
-    FROM logistics_active.order_items oi
-    JOIN public.orders o ON o.id = oi.order_id
-    JOIN public.products p ON p.id = oi.product_id
-   WHERE COALESCE(NULLIF(btrim(COALESCE(p.floriday_trade_item_id, '')), ''),
-                  NULLIF(btrim(COALESCE(p.trade_item_key, '')), ''), p.id::text) = v_key
-     AND o.status = 'Nog te picken' AND NOT public.logistics_reserved_order_excluded(o.id)
-     AND NOT EXISTS (SELECT 1 FROM public.product_bom_items b WHERE b.parent_product_id = p.id)
-     AND NOT EXISTS (SELECT 1 FROM public.product_groups pg
-                      WHERE pg.is_active = true AND (pg.id = p.id OR pg.head_product_id = p.id))
-     AND NOT EXISTS (
-       SELECT 1 FROM public.stock_mutation_log sml
-        WHERE sml.order_item_id = oi.id
-          AND sml.mutation_type = 'consumption');
-
-  PERFORM set_config('stock.change_source', 'RESERVATION_RECOMPUTE', true);
-  UPDATE public.trade_item_stock
-     SET reserved_stock = v_sum,
-         change_source  = 'RESERVATION_RECOMPUTE',
-         updated_at     = now()
-   WHERE trade_item_key = v_key
-     AND reserved_stock IS DISTINCT FROM v_sum;
-END
-$function$
+  END IF;
+  RETURN r || jsonb_build_object(
+    'cartCrates', CASE WHEN v_own IS NOT NULL THEN v_own->'cartCrates' END,
+    'bufferCrates', CASE WHEN v_own IS NOT NULL THEN v_own->'bufferCrates' END,
+    'departureAt', CASE WHEN v_own IS NOT NULL THEN v_own->'departureAt' END,
+    'pickStartsAt', CASE WHEN v_own IS NOT NULL THEN v_own->'pickStartsAt' END,
+    'releaseAt', CASE WHEN v_own IS NOT NULL THEN v_own->'releaseAt' END,
+    'releaseReason', CASE WHEN v_own IS NOT NULL THEN v_own->'releaseReason' END);
+END $function$
 $fsdef$;
 EXCEPTION WHEN undefined_object OR undefined_table OR undefined_function OR invalid_schema_name THEN
-  RAISE NOTICE 'logistiek-engine: functie public.recompute_reserved_stock overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
+  RAISE NOTICE 'logistiek-engine: functie public.pick_queue_cart_plan overgeslagen (onderdeel van andere module ontbreekt): %', SQLERRM;
 END $fsdo$;
 
+
+
 DO $fsdo$ BEGIN
   EXECUTE $fsdef$CREATE OR REPLACE FUNCTION public.logistics_register_tick_apikey(p_key text)
  RETURNS jsonb
@@ -28323,78 +26484,6 @@ AS $function$
 $function$;
 
 -- 4. Centrale beslisregel.
-CREATE OR REPLACE FUNCTION public.logistics_document_for_order(p_order_id uuid, p_documenttype text)
- RETURNS jsonb
- LANGUAGE plpgsql
- STABLE SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
-DECLARE
-  v_soort text := lower(btrim(coalesce(p_documenttype, '')));
-  v_floriday boolean;
-  v_bron text;
-  v_type text;
-  v_res jsonb;
-  v_n int; v_std int; v_id uuid;
-  v_l public.document_layouts%ROWTYPE;
-BEGIN
-  IF v_soort = '' THEN
-    RETURN jsonb_build_object('ok', false, 'layout_id', NULL, 'reden', 'Geen documentsoort opgegeven.');
-  END IF;
-
-  IF to_regprocedure('public.layout_voor_document(uuid,text)') IS NOT NULL THEN
-    EXECUTE 'SELECT to_jsonb(public.layout_voor_document($1, $2))' INTO v_res USING p_order_id, v_soort;
-    IF jsonb_typeof(v_res) <> 'object' THEN
-      RETURN jsonb_build_object('ok', false, 'layout_id', NULL, 'keuze', 'layouts',
-        'reden', 'Layouts gaf geen bruikbaar antwoord voor ' || v_soort || '.');
-    END IF;
-    RETURN v_res || jsonb_build_object('keuze', 'layouts',
-      'ok', coalesce((v_res->>'ok')::boolean, nullif(v_res->>'layout_id', '') IS NOT NULL));
-  END IF;
-
-  -- Automatische keuze (Layouts nog niet bijgewerkt).
-  SELECT o.order_source = 'floriday' INTO v_floriday FROM public.orders o WHERE o.id = p_order_id;
-  IF v_floriday IS NULL THEN
-    RETURN jsonb_build_object('ok', false, 'layout_id', NULL, 'keuze', 'automatisch', 'reden', 'Order niet gevonden.');
-  END IF;
-
-  v_type := CASE
-    WHEN v_soort IN ('eigen_sticker', 'sticker', 'etiket') THEN 'sticker'
-    WHEN v_soort IN ('verzenddocument', 'verzendbrief', 'afleverbrief', 'afleverbon') THEN 'afleverbrief'
-    WHEN v_soort IN ('veilingbrief', 'veilingbon') THEN 'veilingbrief'
-    WHEN v_soort LIKE '%pakbon%' THEN 'pakbon'
-    WHEN v_soort LIKE '%productie%' THEN 'productiebon'
-    ELSE v_soort END;
-  v_bron := CASE
-    WHEN v_floriday AND v_soort <> 'eigen_sticker' AND v_type IN ('sticker', 'traysticker', 'afleverbrief', 'veilingbrief') THEN 'floriday'
-    ELSE 'eigen' END;
-  IF v_bron = 'eigen' AND v_type = 'veilingbrief' THEN
-    RETURN jsonb_build_object('ok', false, 'layout_id', NULL, 'keuze', 'automatisch',
-      'reden', 'Een veilingbrief hoort alleen bij een Floriday-order; voor een eigen order wordt de afleverbrief gebruikt.');
-  END IF;
-
-  SELECT count(*), count(*) FILTER (WHERE is_standaard IS TRUE) INTO v_n, v_std
-    FROM public.document_layouts
-   WHERE actief IS TRUE AND coalesce(bron, 'eigen') = v_bron AND documenttype::text = v_type;
-  IF v_n = 1 THEN
-    SELECT * INTO v_l FROM public.document_layouts
-     WHERE actief IS TRUE AND coalesce(bron, 'eigen') = v_bron AND documenttype::text = v_type;
-  ELSIF v_n > 1 THEN
-    SELECT * INTO v_l FROM public.document_layouts
-     WHERE actief IS TRUE AND coalesce(bron, 'eigen') = v_bron AND documenttype::text = v_type
-     ORDER BY is_standaard DESC NULLS LAST, updated_at DESC LIMIT 1;
-  END IF;
-  IF v_l.id IS NULL THEN
-    RETURN jsonb_build_object('ok', false, 'layout_id', NULL, 'keuze', 'automatisch', 'bron', v_bron, 'documenttype', v_type,
-      'reden', CASE WHEN v_bron = 'floriday'
-        THEN 'Geen actieve ' || v_type || '-layout met bron Floriday. Activeer de Floriday-systeemlayout in Layouts en printers.'
-        ELSE 'Maak of activeer een ' || v_type || 'layout in Layouts en printers.' END);
-  END IF;
-  RETURN jsonb_build_object('ok', true, 'layout_id', v_l.id, 'keuze', 'automatisch', 'bron', v_bron,
-    'documenttype', v_type, 'breedte_mm', v_l.breedte_mm, 'hoogte_mm', v_l.hoogte_mm, 'reden', NULL);
-END;
-$function$;
-
 -- 5. Eigen stickers (HO/MO/AO): één per klant+product, aantal = planten van regels met needs_sticker.
 CREATE OR REPLACE FUNCTION public.logistics_own_sticker_count(p_unit text, p_quantity numeric, p_ppc_regel numeric, p_ppc_product numeric)
 RETURNS integer LANGUAGE sql IMMUTABLE SET search_path = public AS $cnt$
@@ -28436,271 +26525,95 @@ BEGIN
        AND oi.quarantined_at IS NULL
        AND oi.product_id IS NOT NULL
        AND coalesce(o.order_source, '') <> 'floriday'
-       AND o.deleted_at IS NULL AND o.cancelled_at IS NULL
-       AND coalesce(o.status, '') <> 'geannuleerd'
-       AND o.delivery_date >= current_date - 1
-     GROUP BY o.id, o.order_number, o.customer_id, oi.product_id
-     LIMIT greatest(1, p_limit)
-  LOOP
-    v_bron := r.order_id::text || ':' || r.product_id::text;
-    SELECT count(*), (array_agg(s.id))[1] INTO v_n, v_sticker
-      FROM public.customer_product_stickers s
-      JOIN public.customers c ON c.id = r.customer_id
-     WHERE s.trade_item_key = r.product_id::text
-       AND s.customer_key IN (c.id::text, 'tf:' || coalesce(c.twinfield_code, '-'), 'cn:' || coalesce(c.customer_number, '-'));
-    v_status := 'wacht_op_moment'; v_reden := NULL;
-    IF r.onbekend THEN
-      v_status := 'geblokkeerd'; v_reden := 'Aantal stickers onbekend: regel in fust zonder planten per fust (niet op de regel en niet bij het product). Vul planten per fust in.';
-    ELSIF coalesce(r.planten, 0) < 1 THEN
-      v_status := 'geblokkeerd'; v_reden := 'Aantal planten is 0; geen sticker te printen.';
-    ELSIF v_n = 0 THEN
-      v_status := 'geblokkeerd'; v_reden := 'Geen eigen sticker gevonden voor deze klant en dit product. Voeg hem toe bij de klant.';
-    ELSIF v_n > 1 THEN
-      v_status := 'geblokkeerd'; v_reden := 'Meer dan één eigen sticker voor deze klant en dit product; er mag er maar één zijn.';
-    END IF;
-
-    UPDATE public.logistics_sticker_prints
-       SET kopieen = greatest(coalesce(r.planten, 0), 1),
-           eigen_sticker_id = CASE WHEN v_n = 1 THEN v_sticker ELSE NULL END,
-           status = CASE WHEN status = 'geblokkeerd' AND v_status = 'wacht_op_moment' THEN 'wacht_op_moment'
-                         WHEN status = 'niet_printen' THEN v_status
-                         WHEN status = 'wacht_op_moment' THEN v_status ELSE status END,
-           reden = CASE WHEN status IN ('wacht_op_moment', 'geblokkeerd', 'niet_printen') THEN v_reden ELSE reden END,
-           updated_at = now()
-     WHERE soort = 'eigen_sticker' AND bron_id = v_bron
-       AND status IN ('wacht_op_moment', 'geblokkeerd', 'niet_printen');
-    IF NOT FOUND AND NOT EXISTS (SELECT 1 FROM public.logistics_sticker_prints WHERE soort = 'eigen_sticker' AND bron_id = v_bron) THEN
-      INSERT INTO public.logistics_sticker_prints (soort, bron_id, order_id, order_number, kopieen, status, reden, eigen_sticker_id)
-      VALUES ('eigen_sticker', v_bron, r.order_id, r.order_number, greatest(coalesce(r.planten, 0), 1), v_status, v_reden,
-              CASE WHEN v_n = 1 THEN v_sticker ELSE NULL END);
-    END IF;
-    v_bijgewerkt := v_bijgewerkt + 1;
-  END LOOP;
-
-  -- Vinkje uitgezet (of order vervallen) vóór het printen: niet printen.
-  UPDATE public.logistics_sticker_prints p
-     SET status = 'niet_printen', reden = 'Sticker uitgezet op de orderregel of order vervallen.', updated_at = now()
-   WHERE p.soort = 'eigen_sticker' AND p.status IN ('wacht_op_moment', 'geblokkeerd', 'klaar')
-     AND NOT EXISTS (
-       SELECT 1 FROM public.order_items oi JOIN public.orders o ON o.id = oi.order_id
-        WHERE oi.order_id = p.order_id AND p.bron_id = oi.order_id::text || ':' || oi.product_id::text
-          AND oi.needs_sticker IS TRUE AND oi.quarantined_at IS NULL
-          AND o.deleted_at IS NULL AND o.cancelled_at IS NULL AND coalesce(o.status, '') <> 'geannuleerd');
-  GET DIAGNOSTICS v_uit = ROW_COUNT;
-
-  -- Vrijgeven met de pakbon: kar en printplek van de geprinte pakbonrij, formaat uit sticker of layout.
-  WITH vrij AS (
-    SELECT p.id,
-           (SELECT public.logistics_try_uuid(q.payload->>'cartId')
-              FROM public.pick_queue q
-             WHERE q.cancelled_at IS NULL AND q.print_job_id IS NOT NULL
-               AND (q.payload->>'orderId' = p.order_id::text OR q.payload->'orderIds' ? p.order_id::text)
-             ORDER BY q.created_at LIMIT 1) AS kar,
-           (SELECT k.print_plek_id::text
-              FROM public.pick_queue q
-              JOIN public.print_plek_koppelingen k ON k.bron IN ('pickstation', 'pick_station') AND k.bron_id = q.station_id::text
-             WHERE q.cancelled_at IS NULL AND q.print_job_id IS NOT NULL
-               AND (q.payload->>'orderId' = p.order_id::text OR q.payload->'orderIds' ? p.order_id::text)
-             ORDER BY q.created_at, k.created_at LIMIT 1) AS plek,
-           s.width_mm, s.height_mm,
-           public.logistics_document_for_order(p.order_id, 'eigen_sticker') AS lay
-      FROM public.logistics_sticker_prints p
-      LEFT JOIN public.customer_product_stickers s ON s.id = p.eigen_sticker_id
-     WHERE p.soort = 'eigen_sticker' AND p.status = 'wacht_op_moment'
-       AND EXISTS (SELECT 1 FROM public.pick_queue q
-                    WHERE q.cancelled_at IS NULL AND q.print_job_id IS NOT NULL
-                      AND (q.payload->>'orderId' = p.order_id::text OR q.payload->'orderIds' ? p.order_id::text))
-  )
-  UPDATE public.logistics_sticker_prints p
-     SET status = 'klaar', cart_id = vrij.kar, print_plek_id = vrij.plek,
-         breedte_mm = coalesce(vrij.width_mm, (vrij.lay->>'breedte_mm')::numeric),
-         hoogte_mm = coalesce(vrij.height_mm, (vrij.lay->>'hoogte_mm')::numeric),
-         updated_at = now()
-    FROM vrij
-   WHERE p.id = vrij.id;
-  GET DIAGNOSTICS v_vrij = ROW_COUNT;
-
-  RETURN jsonb_build_object('regels', v_bijgewerkt, 'vrijgegeven', v_vrij, 'niet_printen', v_uit);
-END;
-$function$;
-
--- 6. Pakbon van het pickstation: alleen de centrale beslisregel (geen layout uit payload of werkwijze).
-CREATE OR REPLACE FUNCTION public.pick_enqueue_print_job(_queue_item_id uuid, _printer_id uuid, _session_id text, _is_herprint boolean, _cart_id text)
- RETURNS uuid
- LANGUAGE plpgsql
- SECURITY DEFINER
- SET search_path TO 'public'
-AS $function$
-DECLARE
-  item public.pick_queue;
-  dt public.pick_document_types;
-  doc_code text;
-  target_printer uuid;
-  target_layout uuid;
-  target_plek uuid;
-  layout_meta jsonb;
-  layout_reden text;
-  v_types public.doc_layout_type[];
-  doc_type public.doc_layout_type := 'vrij';
-  layout_type public.doc_layout_type;
-  pdf_url text;
-  pdf_b64 text;
-  herkomst text;
-  job_id uuid;
-  cart_plan jsonb := NULL;
-  selected_cart jsonb := NULL;
-  v_cart_uuid uuid;
-  v_barcode text;
-  v_barcode_on boolean := public.logistics_pick_barcode_enabled();
-  v_is_partial boolean := false;
-  v_sleutel text;
-  v_order uuid;
-BEGIN
-  SELECT * INTO item FROM public.pick_queue WHERE id = _queue_item_id;
-  IF NOT FOUND THEN RAISE EXCEPTION 'Dit document bestaat niet meer.'; END IF;
-
-  SELECT * INTO dt FROM public.pick_document_types WHERE id = item.document_type_id;
-
-  doc_code := lower(btrim(coalesce(
-    nullif(item.payload->>'documentType', ''),
-    nullif(dt.code, ''),
-    ''
-  )));
-
-  v_types := public.logistics_document_type_map(doc_code);
-
-  IF _cart_id IS NOT NULL THEN
-    cart_plan := public.pick_queue_cart_plan(_queue_item_id);
-    SELECT c INTO selected_cart
-      FROM jsonb_array_elements(COALESCE(cart_plan->'carts', '[]'::jsonb)) AS c
-     WHERE c->>'cartId' = _cart_id
-     LIMIT 1;
-
-    IF selected_cart IS NULL THEN
-      RAISE EXCEPTION 'De gekozen kar bestaat niet meer in het actuele karplan.';
-    END IF;
-
-    v_is_partial := NOT COALESCE((selected_cart->>'isFullCart')::boolean, false);
-
-    IF v_barcode_on THEN
-      BEGIN
-        v_cart_uuid := nullif(_cart_id, '')::uuid;
-      EXCEPTION WHEN invalid_text_representation THEN
-        v_cart_uuid := NULL;
-      END;
-      IF v_cart_uuid IS NOT NULL THEN
-        v_barcode := public.logistics_ensure_cart_barcode(v_cart_uuid);
-        selected_cart := selected_cart || jsonb_build_object('barcode', v_barcode);
-      END IF;
-    END IF;
-  END IF;
-
-  -- 1.0.176: het document wordt automatisch bepaald uit de order.
-  v_order := public.logistics_try_uuid(COALESCE(selected_cart->>'orderId', item.payload->>'orderId', item.payload->>'order_id'));
-  IF doc_code <> '' AND v_order IS NOT NULL THEN
-    layout_meta := public.logistics_document_for_order(v_order, doc_code);
-    target_layout := public.logistics_try_uuid(layout_meta->>'layout_id');
-    layout_reden := nullif(layout_meta->>'reden', '');
-  ELSIF doc_code <> '' THEN
-    layout_meta := public.logistics_document_layout_v2(doc_code, v_is_partial);
-    target_layout := public.logistics_try_uuid(layout_meta->>'layout_id');
-  END IF;
-
-  SELECT l.documenttype INTO layout_type
-    FROM public.document_layouts l
-   WHERE l.id = target_layout
-     AND l.actief IS TRUE;
-
-  IF layout_type IS NULL THEN
-    target_layout := NULL;
-  END IF;
-
-  doc_type := COALESCE(layout_type, v_types[1], 'vrij');
-
-  IF item.station_id IS NOT NULL THEN
-    SELECT k.print_plek_id INTO target_plek
-      FROM public.print_plek_koppelingen k
-     WHERE k.bron IN ('pickstation', 'pick_station')
-       AND k.bron_id = item.station_id::text
-     ORDER BY k.created_at
-     LIMIT 1;
-  END IF;
-
-  SELECT p.id INTO target_printer
-    FROM public.printers p
-   WHERE p.id = _printer_id
-     AND p.actief
-     AND nullif(p.extern_printer_id, '') IS NOT NULL;
+       AND o.deleted_at IS NULL AND o.cancelled_at IS NULL
+       AND coalesce(o.status, '') <> 'geannuleerd'
+       AND o.delivery_date >= current_date - 1
+     GROUP BY o.id, o.order_number, o.customer_id, oi.product_id
+     LIMIT greatest(1, p_limit)
+  LOOP
+    v_bron := r.order_id::text || ':' || r.product_id::text;
+    SELECT count(*), (array_agg(s.id))[1] INTO v_n, v_sticker
+      FROM public.customer_product_stickers s
+      JOIN public.customers c ON c.id = r.customer_id
+     WHERE s.trade_item_key = r.product_id::text
+       AND s.customer_key IN (c.id::text, 'tf:' || coalesce(c.twinfield_code, '-'), 'cn:' || coalesce(c.customer_number, '-'));
+    v_status := 'wacht_op_moment'; v_reden := NULL;
+    IF r.onbekend THEN
+      v_status := 'geblokkeerd'; v_reden := 'Aantal stickers onbekend: regel in fust zonder planten per fust (niet op de regel en niet bij het product). Vul planten per fust in.';
+    ELSIF coalesce(r.planten, 0) < 1 THEN
+      v_status := 'geblokkeerd'; v_reden := 'Aantal planten is 0; geen sticker te printen.';
+    ELSIF v_n = 0 THEN
+      v_status := 'geblokkeerd'; v_reden := 'Geen eigen sticker gevonden voor deze klant en dit product. Voeg hem toe bij de klant.';
+    ELSIF v_n > 1 THEN
+      v_status := 'geblokkeerd'; v_reden := 'Meer dan één eigen sticker voor deze klant en dit product; er mag er maar één zijn.';
+    END IF;
 
-  pdf_url := nullif(item.payload->>'pdf_url', '');
-  pdf_b64 := nullif(item.payload->>'pdf_base64', '');
-  herkomst := nullif(item.payload->>'herkomst', '');
+    UPDATE public.logistics_sticker_prints
+       SET kopieen = greatest(coalesce(r.planten, 0), 1),
+           eigen_sticker_id = CASE WHEN v_n = 1 THEN v_sticker ELSE NULL END,
+           status = CASE WHEN status = 'geblokkeerd' AND v_status = 'wacht_op_moment' THEN 'wacht_op_moment'
+                         WHEN status = 'niet_printen' THEN v_status
+                         WHEN status = 'wacht_op_moment' THEN v_status ELSE status END,
+           reden = CASE WHEN status IN ('wacht_op_moment', 'geblokkeerd', 'niet_printen') THEN v_reden ELSE reden END,
+           updated_at = now()
+     WHERE soort = 'eigen_sticker' AND bron_id = v_bron
+       AND status IN ('wacht_op_moment', 'geblokkeerd', 'niet_printen');
+    IF NOT FOUND AND NOT EXISTS (SELECT 1 FROM public.logistics_sticker_prints WHERE soort = 'eigen_sticker' AND bron_id = v_bron) THEN
+      INSERT INTO public.logistics_sticker_prints (soort, bron_id, order_id, order_number, kopieen, status, reden, eigen_sticker_id)
+      VALUES ('eigen_sticker', v_bron, r.order_id, r.order_number, greatest(coalesce(r.planten, 0), 1), v_status, v_reden,
+              CASE WHEN v_n = 1 THEN v_sticker ELSE NULL END);
+    END IF;
+    v_bijgewerkt := v_bijgewerkt + 1;
+  END LOOP;
 
-  IF NOT COALESCE(_is_herprint, false) AND _cart_id IS NOT NULL THEN
-    v_sleutel := 'pakbon:' || item.id::text || ':' || _cart_id || ':'
-              || coalesce(target_layout::text, '-') || ':' || coalesce(target_printer::text, '-');
-  END IF;
+  -- Vinkje uitgezet (of order vervallen) vóór het printen: niet printen.
+  UPDATE public.logistics_sticker_prints p
+     SET status = 'niet_printen', reden = 'Sticker uitgezet op de orderregel of order vervallen.', updated_at = now()
+   WHERE p.soort = 'eigen_sticker' AND p.status IN ('wacht_op_moment', 'geblokkeerd', 'klaar')
+     AND NOT EXISTS (
+       SELECT 1 FROM public.order_items oi JOIN public.orders o ON o.id = oi.order_id
+        WHERE oi.order_id = p.order_id AND p.bron_id = oi.order_id::text || ':' || oi.product_id::text
+          AND oi.needs_sticker IS TRUE AND oi.quarantined_at IS NULL
+          AND o.deleted_at IS NULL AND o.cancelled_at IS NULL AND coalesce(o.status, '') <> 'geannuleerd');
+  GET DIAGNOSTICS v_uit = ROW_COUNT;
 
-  INSERT INTO public.print_jobs(
-    printer_id, layout_id, documenttype, documentnaam, status, foutmelding,
-    payload, gebruiker_naam, pdf_url, pdf_base64, herkomst, is_herprint, idempotentie_sleutel
-  )
-  VALUES (
-    target_printer,
-    target_layout,
-    doc_type,
-    COALESCE(item.document_number, 'Pickdocument'),
-    'wachtend',
-    CASE
-      WHEN target_layout IS NULL AND pdf_url IS NULL AND pdf_b64 IS NULL
-        THEN COALESCE(layout_reden, 'Maak of activeer een ' || COALESCE(nullif(doc_code, ''), 'document') || 'layout in Layouts en printers.')
-      ELSE NULL
-    END,
-    jsonb_build_object(
-      'source', 'pickstation',
-      'queue_item_id', item.id,
-      'station_id', item.station_id,
-      'print_plek_id', target_plek,
-      'session_id', _session_id,
-      'is_herprint', COALESCE(_is_herprint, false),
-      'document_number', item.document_number,
-      'document_type_code', COALESCE(nullif(doc_code, ''), dt.code),
-      'report_key', dt.report_key,
-      'print_template', dt.print_template,
-      'order_number', COALESCE(selected_cart->>'orderNumber', item.order_number),
-      'customer_name', item.customer_name,
-      'reference', item.reference,
-      'layout_id', target_layout,
-      'layout_keuze', layout_meta->>'keuze',
-      'layout_variant', CASE WHEN v_is_partial THEN 'partial_order' ELSE 'full_cart' END,
-      'barcode', CASE WHEN v_barcode_on THEN COALESCE(v_barcode, item.barcode) ELSE item.barcode END,
-      'country_code', item.country_code,
-      'cart_id', _cart_id,
-      'cart', selected_cart,
-      'data', COALESCE(item.payload, '{}'::jsonb) || jsonb_build_object(
-        'print_plek_id', target_plek,
-        'cart_id', _cart_id,
-        'cart', selected_cart,
-        'orderId', COALESCE(selected_cart->>'orderId', item.payload->>'orderId'),
-        'orderNumber', COALESCE(selected_cart->>'orderNumber', item.order_number)
-      )
-    ),
-    'Pickstation',
-    pdf_url,
-    pdf_b64,
-    herkomst,
-    COALESCE(_is_herprint, false),
-    v_sleutel
+  -- Vrijgeven met de pakbon: kar en printplek van de geprinte pakbonrij, formaat uit sticker of layout.
+  WITH vrij AS (
+    SELECT p.id,
+           (SELECT public.logistics_try_uuid(q.payload->>'cartId')
+              FROM public.pick_queue q
+             WHERE q.cancelled_at IS NULL AND q.print_job_id IS NOT NULL
+               AND (q.payload->>'orderId' = p.order_id::text OR q.payload->'orderIds' ? p.order_id::text)
+             ORDER BY q.created_at LIMIT 1) AS kar,
+           (SELECT k.print_plek_id::text
+              FROM public.pick_queue q
+              JOIN public.print_plek_koppelingen k ON k.bron IN ('pickstation', 'pick_station') AND k.bron_id = q.station_id::text
+             WHERE q.cancelled_at IS NULL AND q.print_job_id IS NOT NULL
+               AND (q.payload->>'orderId' = p.order_id::text OR q.payload->'orderIds' ? p.order_id::text)
+             ORDER BY q.created_at, k.created_at LIMIT 1) AS plek,
+           s.width_mm, s.height_mm,
+           public.logistics_document_for_order(p.order_id, 'eigen_sticker') AS lay
+      FROM public.logistics_sticker_prints p
+      LEFT JOIN public.customer_product_stickers s ON s.id = p.eigen_sticker_id
+     WHERE p.soort = 'eigen_sticker' AND p.status = 'wacht_op_moment'
+       AND EXISTS (SELECT 1 FROM public.pick_queue q
+                    WHERE q.cancelled_at IS NULL AND q.print_job_id IS NOT NULL
+                      AND (q.payload->>'orderId' = p.order_id::text OR q.payload->'orderIds' ? p.order_id::text))
   )
-  RETURNING id INTO job_id;
-
-  PERFORM public.logistics_enqueue_sticker_with_slip(_queue_item_id, _printer_id, _session_id, COALESCE(_is_herprint,false), _cart_id, job_id);
-  UPDATE public.pick_queue SET print_job_id = job_id WHERE id = _queue_item_id;
+  UPDATE public.logistics_sticker_prints p
+     SET status = 'klaar', cart_id = vrij.kar, print_plek_id = vrij.plek,
+         breedte_mm = coalesce(vrij.width_mm, (vrij.lay->>'breedte_mm')::numeric),
+         hoogte_mm = coalesce(vrij.height_mm, (vrij.lay->>'hoogte_mm')::numeric),
+         updated_at = now()
+    FROM vrij
+   WHERE p.id = vrij.id;
+  GET DIAGNOSTICS v_vrij = ROW_COUNT;
 
-  RETURN job_id;
+  RETURN jsonb_build_object('regels', v_bijgewerkt, 'vrijgegeven', v_vrij, 'niet_printen', v_uit);
 END;
 $function$;
 
+-- 6. Pakbon van het pickstation: alleen de centrale beslisregel (geen layout uit payload of werkwijze).
 REVOKE EXECUTE ON FUNCTION public.logistics_own_sticker_sync(integer) FROM PUBLIC, anon, authenticated;
 GRANT EXECUTE ON FUNCTION public.logistics_own_sticker_sync(integer) TO service_role;
 REVOKE EXECUTE ON FUNCTION public.logistics_document_for_order(uuid, text) FROM PUBLIC, anon;
@@ -29468,243 +27381,76 @@ BEGIN
       v_soort := v_ship->>'documenttype';
       v_extra := jsonb_build_object('verzenddocument_bepaald', v_soort,
         'fulfillment_order_id', v_ship->>'fulfillment_order_id');
-    ELSE
-      v_soort := 'afleverbrief';
-      v_extra := jsonb_build_object('verzenddocument_bepaald', 'afleverbrief');
-    END IF;
-  END IF;
-
-  IF to_regprocedure('public.layout_voor_document(uuid,text)') IS NOT NULL THEN
-    EXECUTE 'SELECT to_jsonb(public.layout_voor_document($1, $2))' INTO v_res USING p_order_id, v_soort;
-    IF jsonb_typeof(v_res) IS DISTINCT FROM 'object' THEN
-      RETURN jsonb_build_object('ok', false, 'layout_id', NULL, 'keuze', 'layouts',
-        'reden', 'Layouts gaf geen bruikbaar antwoord voor ' || v_soort || '.') || v_extra;
-    END IF;
-    RETURN v_res || jsonb_build_object('keuze', 'layouts',
-      'ok', coalesce((v_res->>'ok')::boolean, nullif(v_res->>'layout_id', '') IS NOT NULL)) || v_extra;
-  END IF;
-  SELECT o.order_source = 'floriday' INTO v_floriday FROM public.orders o WHERE o.id = p_order_id;
-  IF v_floriday IS NULL THEN
-    SELECT EXISTS (SELECT 1 FROM public.orders WHERE id = p_order_id) INTO v_floriday;
-    IF NOT v_floriday THEN
-      RETURN jsonb_build_object('ok', false, 'layout_id', NULL, 'keuze', 'automatisch', 'reden', 'Order niet gevonden.');
-    END IF;
-    v_floriday := false;
-  END IF;
-  v_type := CASE
-    WHEN v_soort IN ('eigen_sticker', 'sticker', 'etiket') THEN 'sticker'
-    WHEN v_soort IN ('verzenddocument', 'verzendbrief', 'afleverbrief', 'afleverbon') THEN 'afleverbrief'
-    WHEN v_soort IN ('veilingbrief', 'veilingbon') THEN 'veilingbrief'
-    WHEN v_soort LIKE '%pakbon%' THEN 'pakbon'
-    WHEN v_soort LIKE '%productie%' THEN 'productiebon'
-    ELSE v_soort END;
-  v_bron := CASE
-    WHEN v_floriday AND v_soort <> 'eigen_sticker' AND v_type IN ('sticker', 'traysticker', 'afleverbrief', 'veilingbrief') THEN 'floriday'
-    ELSE 'eigen' END;
-  IF v_bron = 'eigen' AND v_type = 'veilingbrief' THEN
-    RETURN jsonb_build_object('ok', false, 'layout_id', NULL, 'keuze', 'automatisch',
-      'reden', 'Een veilingbrief hoort alleen bij een Floriday-order; voor een eigen order wordt de afleverbrief gebruikt.');
-  END IF;
-  SELECT count(*), count(*) FILTER (WHERE is_standaard IS TRUE) INTO v_n, v_std
-    FROM public.document_layouts
-   WHERE actief IS TRUE AND coalesce(bron, 'eigen') = v_bron AND documenttype::text = v_type;
-  IF v_n >= 1 THEN
-    SELECT * INTO v_l FROM public.document_layouts
-     WHERE actief IS TRUE AND coalesce(bron, 'eigen') = v_bron AND documenttype::text = v_type
-     ORDER BY is_standaard DESC NULLS LAST, updated_at DESC LIMIT 1;
-  END IF;
-  IF v_l.id IS NULL THEN
-    RETURN jsonb_build_object('ok', false, 'layout_id', NULL, 'keuze', 'automatisch', 'bron', v_bron, 'documenttype', v_type,
-      'reden', CASE WHEN v_bron = 'floriday'
-        THEN 'Geen actieve ' || v_type || '-layout met bron Floriday. Activeer de Floriday-systeemlayout in Layouts en printers.'
-        ELSE 'Maak of activeer een ' || v_type || 'layout in Layouts en printers.' END) || v_extra;
-  END IF;
-  RETURN jsonb_build_object('ok', true, 'layout_id', v_l.id, 'keuze', 'automatisch', 'bron', v_bron,
-    'documenttype', v_type, 'breedte_mm', v_l.breedte_mm, 'hoogte_mm', v_l.hoogte_mm, 'reden', NULL) || v_extra;
-END;
-$function$;
-
-
--- ===== 1.0.178: fusten en land per kar, eigen traystickers =====
--- 1.0.178 A: fusten en land per kar in control_get_todays_carts (achteraan toegevoegd)
-DO $m$ BEGIN
-  IF pg_get_function_result('public.control_get_todays_carts()'::regprocedure) NOT LIKE '%crates_on_cart%' THEN
-    DROP FUNCTION public.control_get_todays_carts();
-  END IF;
-END $m$;
-
-CREATE OR REPLACE FUNCTION public.control_get_todays_carts()
- RETURNS TABLE(cart_number_id uuid, cart_number text, order_source text, order_id text, cart_index integer, order_number text, pick_date date, status text, printed_at timestamp with time zone, printed_today boolean, crates_on_cart integer, country_code text)
- LANGUAGE sql STABLE SECURITY DEFINER SET search_path TO 'public'
-AS $function$
-  WITH vandaag AS (
-    SELECT (now() AT TIME ZONE public.logistics_tz())::date AS d
-  ),
-  idx AS (
-    SELECT DISTINCT ON (i.cart_id) i.*
-    FROM public.logistics_cart_index((SELECT d FROM vandaag), (SELECT d FROM vandaag)) i
-    ORDER BY i.cart_id, i.order_number
-  ),
-  gecontroleerd AS (
-    SELECT cci.cart_number_id, cci.order_source, cci.order_id, cci.cart_index
-      FROM public.cart_control_items cci
-      JOIN public.cart_control_sessions ccs ON ccs.id = cci.session_id
-     WHERE ccs.control_date = (SELECT d FROM vandaag)
-       AND cci.action = 'checked'
-  )
-  SELECT
-    i.cart_id,
-    COALESCE(cn.cart_number, i.cart_label),
-    i.order_source,
-    i.order_uuid::text,
-    i.cart_index,
-    i.order_number,
-    i.pick_date,
-    COALESCE(cn.status, 'pending'),
-    i.printed_at,
-    (i.printed_at >= (SELECT d FROM vandaag)::timestamptz),
-    (SELECT sum(ci.crates)::int FROM public.order_cart_items ci WHERE ci.cart_id = i.cart_id),
-    (SELECT CASE WHEN upper(btrim(l.country)) ~ '^[A-Z]{2}$' THEN upper(btrim(l.country)) END
-       FROM public.orders o
-       JOIN public.customer_delivery_locations l
-         ON l.id = public.logistics_try_uuid(o.custom_fields->>'delivery_location')
-      WHERE o.id = i.order_uuid
-      LIMIT 1)
-  FROM idx i
-  LEFT JOIN public.cart_numbers cn
-    ON cn.order_source = i.order_source
-   AND cn.order_id = i.order_uuid::text
-   AND cn.cart_index = i.cart_index
-  LEFT JOIN gecontroleerd g1 ON g1.cart_number_id = i.cart_id
-  LEFT JOIN gecontroleerd g2
-    ON g2.order_source = i.order_source
-   AND g2.order_id = i.order_uuid::text
-   AND g2.cart_index = i.cart_index
-  WHERE COALESCE(cn.status, 'pending') <> 'delivered'
-    AND g1.cart_number_id IS NULL
-    AND g2.order_id IS NULL
-  ORDER BY i.order_number, i.cart_index;
-$function$;
-REVOKE ALL ON FUNCTION public.control_get_todays_carts() FROM PUBLIC, anon;
-GRANT EXECUTE ON FUNCTION public.control_get_todays_carts() TO authenticated, service_role;
-
--- 1.0.178 B: eigen traystickers
-ALTER TABLE public.logistics_sticker_prints DROP CONSTRAINT IF EXISTS logistics_sticker_prints_soort_check;
-ALTER TABLE public.logistics_sticker_prints ADD CONSTRAINT logistics_sticker_prints_soort_check
-  CHECK (soort = ANY (ARRAY['sticker','traysticker','eigen_sticker','eigen_traysticker']));
-
-CREATE OR REPLACE FUNCTION public.logistics_own_traysticker_sync(p_limit integer DEFAULT 200)
- RETURNS jsonb LANGUAGE plpgsql SECURITY DEFINER SET search_path TO 'public'
-AS $function$
-DECLARE
-  s jsonb; v_tray text; v_rel text; v_station text;
-  r record; v_bron text; v_keep text[] := '{}'; n int := 0; n_geblokkeerd int := 0; n_vrij int := 0; n_uit int := 0;
-BEGIN
-  SELECT settings INTO s FROM public.logistics_rule_configs
-   ORDER BY is_active DESC, (status = 'actief') DESC, updated_at DESC LIMIT 1;
-  v_tray := public.logistics_rule_text(s, 'pickstations', 'traysticker_release', 'uit');
-  IF v_tray = 'uit' THEN
-    RETURN jsonb_build_object('trayRelease', v_tray, 'regels', 0);
+    ELSE
+      v_soort := 'afleverbrief';
+      v_extra := jsonb_build_object('verzenddocument_bepaald', 'afleverbrief');
+    END IF;
   END IF;
-  v_rel := public.logistics_rule_text(s, 'pickstations', 'sticker_release', 'with_pick_release');
-  v_station := CASE WHEN v_rel = 'with_packing_slip'
-                    THEN public.logistics_rule_text(s, 'pickstations', 'packing_slip_station', '')
-                    ELSE public.logistics_rule_text(s, 'pickstations', 'sticker_station', '') END;
 
-  FOR r IN
-    SELECT o.id AS order_id, o.order_number, ci.cart_id,
-           bool_or(ci.layer_index IS NULL) AS zonder_indeling,
-           array_agg(DISTINCT ci.layer_index) FILTER (WHERE ci.layer_index IS NOT NULL) AS lagen
-      FROM public.orders o
-      JOIN public.order_items oi ON oi.order_id = o.id
-      JOIN public.order_cart_items ci ON ci.order_item_id = oi.id
-     WHERE coalesce(o.order_source, '') <> 'floriday'
-       AND o.deleted_at IS NULL AND o.cancelled_at IS NULL
-       AND coalesce(o.status, '') <> 'geannuleerd'
-       AND oi.quarantined_at IS NULL
-       AND o.delivery_date >= current_date - 1
-     GROUP BY o.id, o.order_number, ci.cart_id
-     LIMIT greatest(1, p_limit)
-  LOOP
-    IF r.zonder_indeling OR r.lagen IS NULL THEN
-      v_bron := r.order_id::text || ':' || r.cart_id::text || ':geen-indeling';
-      v_keep := v_keep || v_bron;
-      INSERT INTO public.logistics_sticker_prints (soort, bron_id, order_id, order_number, cart_id, kopieen, status, reden)
-      VALUES ('eigen_traysticker', v_bron, r.order_id, r.order_number, r.cart_id, 1, 'geblokkeerd',
-              'Trayindeling ontbreekt voor deze kar: niet elke orderregel heeft een tray (laag). Deel de kar opnieuw in; de rest van de order gaat door.')
-      ON CONFLICT DO NOTHING;
-      n_geblokkeerd := n_geblokkeerd + 1;
-      CONTINUE;
+  IF to_regprocedure('public.layout_voor_document(uuid,text)') IS NOT NULL THEN
+    EXECUTE 'SELECT to_jsonb(public.layout_voor_document($1, $2))' INTO v_res USING p_order_id, v_soort;
+    IF jsonb_typeof(v_res) IS DISTINCT FROM 'object' THEN
+      RETURN jsonb_build_object('ok', false, 'layout_id', NULL, 'keuze', 'layouts',
+        'reden', 'Layouts gaf geen bruikbaar antwoord voor ' || v_soort || '.') || v_extra;
     END IF;
-    FOR i IN 1 .. array_length(r.lagen, 1) LOOP
-      v_bron := r.order_id::text || ':' || r.cart_id::text || ':' || r.lagen[i]::text;
-      v_keep := v_keep || v_bron;
-      INSERT INTO public.logistics_sticker_prints (soort, bron_id, order_id, order_number, cart_id, kopieen, print_plek_id, status, reden)
-      VALUES ('eigen_traysticker', v_bron, r.order_id, r.order_number, r.cart_id, 1,
-              public.logistics_sticker_cart_plek(r.cart_id, v_station), 'wacht_op_moment', 'Wacht op de pakbon van deze kar.')
-      ON CONFLICT DO NOTHING;
-      n := n + 1;
-    END LOOP;
-  END LOOP;
+    RETURN v_res || jsonb_build_object('keuze', 'layouts',
+      'ok', coalesce((v_res->>'ok')::boolean, nullif(v_res->>'layout_id', '') IS NOT NULL)) || v_extra;
+  END IF;
+  SELECT o.order_source = 'floriday' INTO v_floriday FROM public.orders o WHERE o.id = p_order_id;
+  IF v_floriday IS NULL THEN
+    SELECT EXISTS (SELECT 1 FROM public.orders WHERE id = p_order_id) INTO v_floriday;
+    IF NOT v_floriday THEN
+      RETURN jsonb_build_object('ok', false, 'layout_id', NULL, 'keuze', 'automatisch', 'reden', 'Order niet gevonden.');
+    END IF;
+    v_floriday := false;
+  END IF;
+  v_type := CASE
+    WHEN v_soort IN ('eigen_sticker', 'sticker', 'etiket') THEN 'sticker'
+    WHEN v_soort IN ('verzenddocument', 'verzendbrief', 'afleverbrief', 'afleverbon') THEN 'afleverbrief'
+    WHEN v_soort IN ('veilingbrief', 'veilingbon') THEN 'veilingbrief'
+    WHEN v_soort LIKE '%pakbon%' THEN 'pakbon'
+    WHEN v_soort LIKE '%productie%' THEN 'productiebon'
+    ELSE v_soort END;
+  v_bron := CASE
+    WHEN v_floriday AND v_soort <> 'eigen_sticker' AND v_type IN ('sticker', 'traysticker', 'afleverbrief', 'veilingbrief') THEN 'floriday'
+    ELSE 'eigen' END;
+  IF v_bron = 'eigen' AND v_type = 'veilingbrief' THEN
+    RETURN jsonb_build_object('ok', false, 'layout_id', NULL, 'keuze', 'automatisch',
+      'reden', 'Een veilingbrief hoort alleen bij een Floriday-order; voor een eigen order wordt de afleverbrief gebruikt.');
+  END IF;
+  SELECT count(*), count(*) FILTER (WHERE is_standaard IS TRUE) INTO v_n, v_std
+    FROM public.document_layouts
+   WHERE actief IS TRUE AND coalesce(bron, 'eigen') = v_bron AND documenttype::text = v_type;
+  IF v_n >= 1 THEN
+    SELECT * INTO v_l FROM public.document_layouts
+     WHERE actief IS TRUE AND coalesce(bron, 'eigen') = v_bron AND documenttype::text = v_type
+     ORDER BY is_standaard DESC NULLS LAST, updated_at DESC LIMIT 1;
+  END IF;
+  IF v_l.id IS NULL THEN
+    RETURN jsonb_build_object('ok', false, 'layout_id', NULL, 'keuze', 'automatisch', 'bron', v_bron, 'documenttype', v_type,
+      'reden', CASE WHEN v_bron = 'floriday'
+        THEN 'Geen actieve ' || v_type || '-layout met bron Floriday. Activeer de Floriday-systeemlayout in Layouts en printers.'
+        ELSE 'Maak of activeer een ' || v_type || 'layout in Layouts en printers.' END) || v_extra;
+  END IF;
+  RETURN jsonb_build_object('ok', true, 'layout_id', v_l.id, 'keuze', 'automatisch', 'bron', v_bron,
+    'documenttype', v_type, 'breedte_mm', v_l.breedte_mm, 'hoogte_mm', v_l.hoogte_mm, 'reden', NULL) || v_extra;
+END;
+$function$;
 
-  -- Indeling hersteld of tray vervallen: niet meer printen (alleen nog niet geprinte rijen).
-  UPDATE public.logistics_sticker_prints p
-     SET status = 'niet_printen', reden = 'Tray hoort niet meer bij deze kar of order vervallen.', updated_at = now()
-   WHERE p.soort = 'eigen_traysticker' AND p.status IN ('wacht_op_moment', 'geblokkeerd', 'klaar')
-     AND NOT (p.bron_id = ANY (v_keep))
-     AND p.order_id IN (SELECT o.id FROM public.orders o WHERE o.delivery_date >= current_date - 1);
-  GET DIAGNOSTICS n_uit = ROW_COUNT;
 
-  -- Vrijgave: met de pakbon van de kar (zoals eigen stickers).
-  UPDATE public.logistics_sticker_prints p
-     SET status = 'klaar', reden = NULL,
-         print_plek_id = coalesce(p.print_plek_id, public.logistics_sticker_cart_plek(p.cart_id, v_station)),
-         updated_at = now()
-   WHERE p.soort = 'eigen_traysticker' AND p.status = 'wacht_op_moment'
-     AND p.cart_id IS NOT NULL AND public.logistics_cart_slip_queued(p.cart_id);
-  GET DIAGNOSTICS n_vrij = ROW_COUNT;
+-- ===== 1.0.178: fusten en land per kar, eigen traystickers =====
+-- 1.0.178 A: fusten en land per kar in control_get_todays_carts (achteraan toegevoegd)
+DO $m$ BEGIN
+  IF pg_get_function_result('public.control_get_todays_carts()'::regprocedure) NOT LIKE '%crates_on_cart%' THEN
+    DROP FUNCTION public.control_get_todays_carts();
+  END IF;
+END $m$;
 
-  RETURN jsonb_build_object('trayRelease', v_tray, 'trays', n, 'geblokkeerd', n_geblokkeerd, 'vrijgegeven', n_vrij, 'niet_printen', n_uit);
-END; $function$;
-REVOKE ALL ON FUNCTION public.logistics_own_traysticker_sync(integer) FROM PUBLIC, anon, authenticated;
-GRANT EXECUTE ON FUNCTION public.logistics_own_traysticker_sync(integer) TO service_role;
+-- 1.0.178 B: eigen traystickers
+ALTER TABLE public.logistics_sticker_prints DROP CONSTRAINT IF EXISTS logistics_sticker_prints_soort_check;
+ALTER TABLE public.logistics_sticker_prints ADD CONSTRAINT logistics_sticker_prints_soort_check
+  CHECK (soort = ANY (ARRAY['sticker','traysticker','eigen_sticker','eigen_traysticker']));
 
-CREATE OR REPLACE FUNCTION public.logistics_own_traysticker_payload(p_id uuid)
- RETURNS jsonb LANGUAGE plpgsql STABLE SECURITY DEFINER SET search_path TO 'public'
-AS $function$
-DECLARE p record; o record; v_laag int; v_nr int; v_tot int; v_loc text; v_prod jsonb;
-BEGIN
-  SELECT * INTO p FROM public.logistics_sticker_prints WHERE id = p_id AND soort = 'eigen_traysticker';
-  IF p.id IS NULL THEN RETURN jsonb_build_object('ok', false, 'reden', 'Traysticker niet gevonden.'); END IF;
-  v_laag := nullif(split_part(p.bron_id, ':', 3), '')::int;
-  SELECT * INTO o FROM public.orders WHERE id = p.order_id;
-  SELECT count(DISTINCT ci.layer_index),
-         count(DISTINCT ci.layer_index) FILTER (WHERE ci.layer_index <= v_laag)
-    INTO v_tot, v_nr
-    FROM public.order_cart_items ci JOIN public.order_items oi ON oi.id = ci.order_item_id
-   WHERE oi.order_id = p.order_id AND ci.cart_id = p.cart_id AND ci.layer_index IS NOT NULL;
-  SELECT coalesce(jsonb_agg(jsonb_build_object(
-           'artikelnummer', prd.article_number,
-           'naam', coalesce(ci.product_name, oi.product_name),
-           'aantal', coalesce(ci.crates_in_layer, ci.crates)) ORDER BY coalesce(ci.product_name, oi.product_name)), '[]'::jsonb)
-    INTO v_prod
-    FROM public.order_cart_items ci JOIN public.order_items oi ON oi.id = ci.order_item_id
-    LEFT JOIN public.products prd ON prd.id = coalesce(ci.product_id, oi.product_id)
-   WHERE oi.order_id = p.order_id AND ci.cart_id = p.cart_id AND ci.layer_index = v_laag;
-  SELECT nullif(btrim(concat_ws(', ', nullif(btrim(l.name), ''), nullif(btrim(l.city), ''), nullif(btrim(l.country), ''))), '')
-    INTO v_loc
-    FROM public.customer_delivery_locations l
-   WHERE l.id = public.logistics_try_uuid(o.custom_fields->>'delivery_location');
-  IF v_tot IS NULL OR v_tot = 0 OR jsonb_array_length(v_prod) = 0 THEN
-    RETURN jsonb_build_object('ok', false, 'reden', 'Trayindeling ontbreekt voor deze tray. Deel de kar opnieuw in.');
-  END IF;
-  RETURN jsonb_build_object('ok', true, 'payload', jsonb_build_object(
-    'order_id', o.id, 'order_number', o.order_number, 'ordernummer', o.order_number,
-    'klantnaam', o.customer_name, 'leverdatum', o.delivery_date, 'afleverlocatie', v_loc,
-    'cart_id', p.cart_id, 'tray_nummer', v_nr, 'tray_totaal', v_tot, 'tray_producten', v_prod));
-END; $function$;
-REVOKE ALL ON FUNCTION public.logistics_own_traysticker_payload(uuid) FROM PUBLIC, anon, authenticated;
-GRANT EXECUTE ON FUNCTION public.logistics_own_traysticker_payload(uuid) TO service_role;
 -- ===== 1.0.178 correctie: eigen traysticker per fust =====
 -- 1.0.178 correctie: eigen traysticker per FUST (niet per laag).
 -- Sleutel: order:kar:karregel:fustnummer. Crates onbekend: één geblokkeerde rij per karregel.
@@ -29719,79 +27465,6 @@ RETURNS integer LANGUAGE sql IMMUTABLE SET search_path = public AS $tp$
   END
 $tp$;
 
-CREATE OR REPLACE FUNCTION public.logistics_own_traysticker_sync(p_limit integer DEFAULT 200)
- RETURNS jsonb LANGUAGE plpgsql SECURITY DEFINER SET search_path TO 'public'
-AS $function$
-DECLARE
-  s jsonb; v_tray text; v_rel text; v_station text;
-  r record; v_bron text; v_keep text[] := '{}'; n int := 0; n_geblokkeerd int := 0; n_vrij int := 0; n_uit int := 0;
-BEGIN
-  SELECT settings INTO s FROM public.logistics_rule_configs
-   ORDER BY is_active DESC, (status = 'actief') DESC, updated_at DESC LIMIT 1;
-  v_tray := public.logistics_rule_text(s, 'pickstations', 'traysticker_release', 'uit');
-  IF v_tray = 'uit' THEN
-    RETURN jsonb_build_object('trayRelease', v_tray, 'regels', 0);
-  END IF;
-  v_rel := public.logistics_rule_text(s, 'pickstations', 'sticker_release', 'with_pick_release');
-  v_station := CASE WHEN v_rel = 'with_packing_slip'
-                    THEN public.logistics_rule_text(s, 'pickstations', 'packing_slip_station', '')
-                    ELSE public.logistics_rule_text(s, 'pickstations', 'sticker_station', '') END;
-
-  FOR r IN
-    SELECT o.id AS order_id, o.order_number, ci.cart_id, ci.id AS ci_id, ci.crates
-      FROM public.orders o
-      JOIN public.order_items oi ON oi.order_id = o.id
-      JOIN public.order_cart_items ci ON ci.order_item_id = oi.id
-     WHERE coalesce(o.order_source, '') <> 'floriday'
-       AND o.deleted_at IS NULL AND o.cancelled_at IS NULL
-       AND coalesce(o.status, '') <> 'geannuleerd'
-       AND oi.quarantined_at IS NULL
-       AND o.delivery_date >= current_date - 1
-     ORDER BY o.order_number, ci.cart_id, ci.created_at, ci.id
-     LIMIT greatest(1, p_limit)
-  LOOP
-    IF r.crates IS NULL OR r.crates <= 0 THEN
-      v_bron := r.order_id::text || ':' || r.cart_id::text || ':' || r.ci_id::text || ':onbekend';
-      v_keep := v_keep || v_bron;
-      INSERT INTO public.logistics_sticker_prints (soort, bron_id, order_id, order_number, cart_id, kopieen, status, reden)
-      VALUES ('eigen_traysticker', v_bron, r.order_id, r.order_number, r.cart_id, 1, 'geblokkeerd',
-              'Aantal fusten onbekend voor deze regel op de kar. De rest van de order gaat door.')
-      ON CONFLICT DO NOTHING;
-      n_geblokkeerd := n_geblokkeerd + 1;
-      CONTINUE;
-    END IF;
-    FOR k IN 1 .. r.crates LOOP
-      v_bron := r.order_id::text || ':' || r.cart_id::text || ':' || r.ci_id::text || ':' || k::text;
-      v_keep := v_keep || v_bron;
-      INSERT INTO public.logistics_sticker_prints (soort, bron_id, order_id, order_number, cart_id, kopieen, print_plek_id, status, reden)
-      VALUES ('eigen_traysticker', v_bron, r.order_id, r.order_number, r.cart_id, 1,
-              public.logistics_sticker_cart_plek(r.cart_id, v_station), 'wacht_op_moment', 'Wacht op de pakbon van deze kar.')
-      ON CONFLICT DO NOTHING;
-      n := n + 1;
-    END LOOP;
-  END LOOP;
-
-  -- Oude laagsleutels, vervallen fusten of orders: niet meer printen (alleen nog niet geprinte rijen, geen DELETE).
-  UPDATE public.logistics_sticker_prints p
-     SET status = 'niet_printen', reden = 'Fust hoort niet meer bij deze kar of order vervallen.', updated_at = now()
-   WHERE p.soort = 'eigen_traysticker' AND p.status IN ('wacht_op_moment', 'geblokkeerd', 'klaar')
-     AND NOT (p.bron_id = ANY (v_keep))
-     AND p.order_id IN (SELECT o.id FROM public.orders o WHERE o.delivery_date >= current_date - 1);
-  GET DIAGNOSTICS n_uit = ROW_COUNT;
-
-  UPDATE public.logistics_sticker_prints p
-     SET status = 'klaar', reden = NULL,
-         print_plek_id = coalesce(p.print_plek_id, public.logistics_sticker_cart_plek(p.cart_id, v_station)),
-         updated_at = now()
-   WHERE p.soort = 'eigen_traysticker' AND p.status = 'wacht_op_moment'
-     AND p.cart_id IS NOT NULL AND public.logistics_cart_slip_queued(p.cart_id);
-  GET DIAGNOSTICS n_vrij = ROW_COUNT;
-
-  RETURN jsonb_build_object('trayRelease', v_tray, 'fusten', n, 'geblokkeerd', n_geblokkeerd, 'vrijgegeven', n_vrij, 'niet_printen', n_uit);
-END; $function$;
-REVOKE ALL ON FUNCTION public.logistics_own_traysticker_sync(integer) FROM PUBLIC, anon, authenticated;
-GRANT EXECUTE ON FUNCTION public.logistics_own_traysticker_sync(integer) TO service_role;
-
 CREATE OR REPLACE FUNCTION public.logistics_own_traysticker_payload(p_id uuid)
  RETURNS jsonb LANGUAGE plpgsql STABLE SECURITY DEFINER SET search_path TO 'public'
 AS $function$
@@ -31388,30 +29061,6 @@ BEGIN
 END $function$;
 
 -- Handmatig kiezen: de enige manier. NULL = terug naar automatisch. Verstuurt nooit een mail.
-CREATE OR REPLACE FUNCTION public.logistics_set_order_carrier(p_order_id uuid, p_carrier_id uuid)
- RETURNS jsonb LANGUAGE plpgsql SECURITY DEFINER SET search_path TO 'public'
-AS $function$
-DECLARE v_uid uuid := auth.uid(); o jsonb; v_skip text; r jsonb;
-BEGIN
-  IF v_uid IS NULL AND coalesce(auth.role(), '') <> 'service_role' THEN RAISE EXCEPTION 'Niet ingelogd'; END IF;
-  SELECT to_jsonb(x) INTO o FROM public.orders x WHERE x.id = p_order_id AND x.deleted_at IS NULL FOR UPDATE;
-  IF o IS NULL THEN RAISE EXCEPTION 'Order niet gevonden.'; END IF;
-  IF p_carrier_id IS NOT NULL THEN
-    v_skip := public.logistics_carrier_skip_reason(p_carrier_id);
-    IF v_skip IS NOT NULL THEN RAISE EXCEPTION 'Deze vervoerder kan niet gekozen worden: %.', v_skip; END IF;
-    r := public.logistics_carrier_result(p_carrier_id, 'handmatig', 'Handmatig gekozen op de order.', '{}'::text[]);
-  ELSE
-    r := public.logistics_resolve_carrier_core(o, true);
-  END IF;
-  PERFORM set_config('logistics.carrier_writer', 'engine', true);
-  UPDATE public.orders
-     SET carrier_id = public.logistics_try_uuid(r->>'carrier_id'), carrier_source = r->>'bron',
-         carrier_reason = r->>'reden', carrier_resolved_at = now(), carrier_set_by = v_uid, carrier_set_at = now()
-   WHERE id = p_order_id;
-  PERFORM set_config('logistics.carrier_writer', '', true);
-  RETURN r || jsonb_build_object('bevroren', public.logistics_carrier_frozen_reason(p_order_id));
-END $function$;
-
 -- Lijst F: wat de regel per bestaande open order zou opslaan (alleen lezen).
 CREATE OR REPLACE FUNCTION public.logistics_carrier_preview_existing(p_limit integer DEFAULT 1000)
  RETURNS TABLE(order_id uuid, order_number text, order_source text, delivery_date text, huidig_custom_carrier text,
@@ -31918,10 +29567,21 @@ AS $function$
       OR session_user::text <> 'authenticator'
 $function$;
 
+CREATE OR REPLACE FUNCTION public.logistics_acc_entry()
+ RETURNS text LANGUAGE sql STABLE SET search_path TO 'public'
+AS $function$
+  SELECT nullif(current_setting('request.path', true), '')
+$function$;
+REVOKE ALL ON FUNCTION public.logistics_acc_entry() FROM PUBLIC, anon;
+GRANT EXECUTE ON FUNCTION public.logistics_acc_entry() TO authenticated, service_role;
+COMMENT ON FUNCTION public.logistics_acc_entry() IS 'Logistiek Engine: het API-adres van het lopende verzoek (request.path), voor de ketenherkenning.';
+
 CREATE OR REPLACE FUNCTION public.logistics_acc_direct(p_fn text)
  RETURNS boolean LANGUAGE sql STABLE SET search_path TO 'public'
 AS $function$
-  SELECT coalesce(current_query(), '') ~* ('(^|[^a-z0-9_])' || p_fn || '([^a-z0-9_]|$)')
+  -- Rechtstreeks = het API-adres van dit verzoek is deze functie zelf, of onbekend (fail closed).
+  -- Een ander /rpc/-adres: aangeroepen vanuit een functie die de API mocht uitvoeren (keten).
+  SELECT coalesce(lower(public.logistics_acc_entry()) = '/rpc/' || lower(p_fn), true)
 $function$;
 
 CREATE OR REPLACE FUNCTION public.logistics_acc_guard(p_level text, p_fn text)
@@ -32099,4 +29759,60 @@ BEGIN
     v_def := regexp_replace(v_def, 'END \$function\$\s*$', E'  RETURN QUERY SELECT * FROM public.logistics_access_check();\nEND $function$');
     EXECUTE v_def;
   END IF;
-END $ic$;
+END $ic$;
+
+-- 1.0.186: pickschermlijst verwerkt. Alleen de 16 functies uit tabel C blijven open;
+-- de rest krijgt het niveau 'ingelogd' met ketenherkenning via request.path.
+DO $lv$
+DECLARE v_def text;
+BEGIN
+  v_def := pg_get_functiondef('public.logistics_acc_levels()'::regprocedure);
+  IF position('wacht op pickschermlijst' IN v_def) > 0 AND position('SELECT * FROM (' IN v_def) > 0 THEN
+    v_def := replace(v_def, 'SELECT * FROM (',
+      'SELECT v.functie, CASE WHEN v.niveau = ''wacht op pickschermlijst'' THEN CASE WHEN v.functie = ANY (ARRAY[''logistics_auto_send_status'',''logistics_barcode_lookup'',''logistics_cart_plan_status'',''logistics_cart_slip_plan'',''logistics_cart_sticker_state'',''logistics_complete_task'',''logistics_document_for_order'',''logistics_is_pick_workday'',''logistics_order_released'',''logistics_order_sticker_meldingen'',''logistics_pick_mode'',''logistics_scan_resolve'',''logistics_shipping_note_from_barcode'',''logistics_shipping_note_status'',''logistics_working_hours_status'',''pick_queue_cart_plan'']) THEN ''open (pickscherm/scanner zonder inlog)'' ELSE ''ingelogd'' END ELSE v.niveau END AS niveau FROM (');
+    v_def := replace(v_def, ') v(functie, niveau)', ') v(functie, niveau)');
+    EXECUTE v_def;
+  END IF;
+END $lv$;
+
+DO $acc$
+DECLARE r record; v_def text; v_new text; v_pos int; v_fail text[] := '{}'::text[]; n int := 0;
+BEGIN
+  FOR r IN
+    SELECT p.oid, p.proname, l.lanname, p.prosrc, x.lvl
+      FROM public.logistics_acc_levels() x(fn, lvl)
+      JOIN pg_proc p ON p.proname = x.fn AND p.pronamespace = 'public'::regnamespace
+      JOIN pg_language l ON l.oid = p.prolang
+     WHERE x.lvl IN ('server', 'ingelogd', 'beheer')
+       AND p.prorettype <> 'trigger'::regtype AND coalesce(p.prosrc, '') <> ''
+       AND p.prosrc NOT LIKE '%logistics_acc_guard(%'
+       AND (p.proname <> 'pick_enqueue_print_job'
+            OR pg_get_function_identity_arguments(p.oid) IN (
+                 '_queue_item_id uuid, _printer_id uuid, _session_id text, _is_herprint boolean',
+                 '_queue_item_id uuid, _printer_id uuid, _session_id text, _is_herprint boolean, _cart_id text'))
+  LOOP
+    BEGIN
+      v_def := pg_get_functiondef(r.oid);
+      IF r.lanname = 'plpgsql' THEN
+        v_pos := regexp_instr(r.prosrc, '\mBEGIN\M', 1, 1, 1, 'i');
+        IF v_pos = 0 THEN RAISE EXCEPTION 'geen BEGIN gevonden'; END IF;
+        v_new := left(r.prosrc, v_pos - 1) || E'\n  PERFORM public.logistics_acc_guard(' || quote_literal(r.lvl) || ', '
+                 || quote_literal(r.proname) || ');' || substr(r.prosrc, v_pos);
+      ELSIF r.lanname = 'sql' THEN
+        v_new := E'\n  SELECT public.logistics_acc_guard(' || quote_literal(r.lvl) || ', ' || quote_literal(r.proname) || ');' || r.prosrc;
+      ELSE
+        RAISE EXCEPTION 'taal % niet ondersteund', r.lanname;
+      END IF;
+      v_pos := position(r.prosrc IN v_def);
+      IF v_pos = 0 THEN RAISE EXCEPTION 'definitie niet te herschrijven'; END IF;
+      v_def := overlay(v_def placing v_new from v_pos for length(r.prosrc));
+      EXECUTE v_def;
+      n := n + 1;
+    EXCEPTION WHEN OTHERS THEN
+      v_fail := v_fail || (r.proname || ': ' || SQLERRM);
+    END;
+  END LOOP;
+  RAISE NOTICE 'pickschermlijst: % functies voorzien; mislukt: %', n, array_to_string(v_fail, ' | ');
+END $acc$;
+
+ALTER FUNCTION public.logistics_cart_barcode_value(uuid) SET search_path TO 'public';