@flowselections/floriday-voorraad 1.0.92 → 1.0.96

package/sql/floriday-voorraad-schema.sql

@@ -1,4 +1,4 @@
--- @flowselections/floriday-voorraad 1.0.91 – volledig schema (idempotent, geen gegevens).
+-- @flowselections/floriday-voorraad 1.0.95 – volledig schema (idempotent, geen gegevens).
 -- Gegenereerd uit de database met scripts/generate-voorraad-schema.py. Niet met de hand wijzigen.
 -- Volgorde 20. Ontbrekende tabellen van andere modules worden overgeslagen met een NOTICE; draai opnieuw na die module.
 -- De statuscontrole van floriday_continuous_stock_queue is van Voorraad en wordt hier opnieuw gemaakt.
@@ -276,6 +276,25 @@ ALTER TABLE public.product_merge_log ADD COLUMN IF NOT EXISTS snapshot jsonb DEF
 ALTER TABLE public.product_merge_log ADD COLUMN IF NOT EXISTS notes text;
 ALTER TABLE public.product_merge_log ADD COLUMN IF NOT EXISTS merged_at timestamp with time zone DEFAULT now() NOT NULL;
 
+-- product_packings
+CREATE TABLE IF NOT EXISTS public.product_packings ();
+ALTER TABLE public.product_packings ADD COLUMN IF NOT EXISTS id uuid DEFAULT gen_random_uuid() NOT NULL;
+ALTER TABLE public.product_packings ADD COLUMN IF NOT EXISTS product_id uuid NOT NULL;
+ALTER TABLE public.product_packings ADD COLUMN IF NOT EXISTS source text DEFAULT 'eigen'::text NOT NULL;
+ALTER TABLE public.product_packings ADD COLUMN IF NOT EXISTS floriday_packing_id text;
+ALTER TABLE public.product_packings ADD COLUMN IF NOT EXISTS vbn_package_code integer;
+ALTER TABLE public.product_packings ADD COLUMN IF NOT EXISTS custom_package_id text;
+ALTER TABLE public.product_packings ADD COLUMN IF NOT EXISTS fust_type_id uuid;
+ALTER TABLE public.product_packings ADD COLUMN IF NOT EXISTS load_carrier text;
+ALTER TABLE public.product_packings ADD COLUMN IF NOT EXISTS pieces_per_package integer;
+ALTER TABLE public.product_packings ADD COLUMN IF NOT EXISTS packages_per_layer integer;
+ALTER TABLE public.product_packings ADD COLUMN IF NOT EXISTS layers_per_load_carrier integer;
+ALTER TABLE public.product_packings ADD COLUMN IF NOT EXISTS is_primary boolean DEFAULT false NOT NULL;
+ALTER TABLE public.product_packings ADD COLUMN IF NOT EXISTS customer_organization_ids text[] DEFAULT '{}'::text[] NOT NULL;
+ALTER TABLE public.product_packings ADD COLUMN IF NOT EXISTS sort_order integer DEFAULT 0 NOT NULL;
+ALTER TABLE public.product_packings ADD COLUMN IF NOT EXISTS created_at timestamp with time zone DEFAULT now() NOT NULL;
+ALTER TABLE public.product_packings ADD COLUMN IF NOT EXISTS updated_at timestamp with time zone DEFAULT now() NOT NULL;
+
 -- product_tray_stickers
 CREATE TABLE IF NOT EXISTS public.product_tray_stickers ();
 ALTER TABLE public.product_tray_stickers ADD COLUMN IF NOT EXISTS product_id uuid NOT NULL;
@@ -901,7 +920,8 @@ BEGIN
   SELECT * INTO s FROM public.floriday_inventory_settings
    WHERE connection_id = p_connection_id AND product_id = p_product_id;
   stock_mode := COALESCE(s.stock_mode, 'FOLLOW_ERP');
-  SELECT NULLIF(p.plants_per_crate, 0) INTO v_pack FROM public.products p WHERE p.id = p_product_id;
+  -- Verpakking alleen uit de echte (primaire) verpakking, nooit uit products.*.
+  v_pack := public.product_primary_pieces(p_product_id);
 
   v_calc := public.calculate_structure_available(p_connection_id, p_product_id);
   v_type := v_calc->>'type';
@@ -910,11 +930,9 @@ BEGIN
   v_reason := v_calc->>'reason';
   erp_available := v_avail; packing_size := v_pack; reason := NULL;
 
-  -- Lid van een actieve productgroep: nooit los naar Floriday (de groep publiceert).
   IF v_type IS DISTINCT FROM 'GROUP' AND cardinality(public.product_member_group_ids(p_product_id)) > 0 THEN
     desired_quantity := 0; desired_availability := false; reason := 'GROUP_MEMBER_OFF'; RETURN NEXT; RETURN;
   END IF;
-
   IF stock_mode = 'DISABLED' THEN
     desired_quantity := 0; desired_availability := false; RETURN NEXT; RETURN;
   END IF;
@@ -2142,7 +2160,6 @@ AS $function$
 DECLARE a record; n integer := 0; v_ins integer; v_norm text := public.normalize_order_source(p_source);
 BEGIN
   IF p_order_item_id IS NULL THEN RETURN 0; END IF;
-  -- Oude route had al afgeboekt (voor de markering bestond)
   IF EXISTS (SELECT 1 FROM public.stock_mutation_log WHERE order_item_id = p_order_item_id AND mutation_type = 'consumption')
      AND NOT EXISTS (SELECT 1 FROM public.stock_mutation_log WHERE order_item_id = p_order_item_id AND mutation_type = 'consumption_done') THEN
     RETURN 0;
@@ -2158,9 +2175,17 @@ BEGIN
       INSERT INTO public.stock_mutation_log(trade_item_key, order_id, order_item_id, order_source, mutation_type, qty_delta, reason, created_by)
       VALUES (a.trade_item_key, p_order_id, p_order_item_id, v_norm, 'consumption_blocked', COALESCE(a.qty,0),
         'toewijzing Engine: ' || COALESCE(a.note, 'fout'), auth.uid());
+    ELSIF COALESCE(a.qty,0) > 0 AND v_norm = 'FO' AND public.voorraad_floriday_leads_key(a.trade_item_key) THEN
+      -- Floriday leidt: Floriday heeft deze verkoop al van het eigen aanbod afgetrokken.
+      INSERT INTO public.stock_mutation_log(trade_item_key, order_id, order_item_id, order_source, mutation_type, qty_delta, reason, created_by)
+      VALUES (a.trade_item_key, p_order_id, p_order_item_id, v_norm, 'consumption_skipped', a.qty,
+        'Niet afgeboekt: Floriday leidt dit artikel en heeft de verkoop al verwerkt — ' || COALESCE(p_reason,''), auth.uid());
     ELSIF COALESCE(a.qty,0) > 0 THEN
       PERFORM public.apply_stock_consumption(a.trade_item_key, a.qty, p_order_id, p_order_item_id, p_source,
         COALESCE(p_reason,'afgeboekt') || ' [' || a.source || ']');
+      IF v_norm <> 'FO' AND public.voorraad_floriday_leads_key(a.trade_item_key) THEN
+        PERFORM public.voorraad_alert_floriday_not_updated(a.trade_item_key, a.qty, p_order_id, p_order_item_id);
+      END IF;
       n := n + 1;
     END IF;
   END LOOP;
@@ -2799,7 +2824,7 @@ CREATE OR REPLACE FUNCTION public.floriday_desired_stock_regression_check()
 AS $function$
   WITH b AS (
     SELECT s.connection_id, s.product_id, p.product, s.stock_mode, s.buffer_quantity, s.maximum_quantity, s.fixed_quantity, s.manual_quantity,
-           NULLIF(p.plants_per_crate,0) AS pack,
+           public.product_primary_pieces(p.id) AS pack,
            (SELECT GREATEST(0, floor(ts.physical_stock - ts.reserved_stock))::int FROM public.trade_item_stock ts
              WHERE ts.connection_id = s.connection_id
                AND ts.trade_item_key = COALESCE(NULLIF(btrim(p.floriday_trade_item_id),''), NULLIF(btrim(p.trade_item_key),''))) AS avail
@@ -2987,6 +3012,7 @@ BEGIN
        WHERE t.trade_item_key IN (v_tid, 'product:'||v_pid::text, v_pid::text)
        ORDER BY (t.trade_item_key = v_tid) DESC, t.updated_at DESC NULLS LAST LIMIT 1;
       v_stock := NULLIF(v_it->>'stock','')::numeric;
+      IF v_stock IS NULL THEN v_res := 'Geen Floriday-voorraad gevonden (geen doorlopende voorraad en geen weekaanbod voor deze week)'; END IF;
       IF v_stock IS NOT NULL AND v_stock >= 0 AND v_stock IS DISTINCT FROM v_cur_stock THEN
         IF v_uid IS NULL THEN RAISE EXCEPTION 'Geen eigenaar bij de voorraadsturing'; END IF;
         PERFORM set_config('request.jwt.claims', json_build_object('sub', v_uid, 'role', 'authenticated')::text, true);
@@ -3266,6 +3292,9 @@ BEGIN
     UPDATE public.floriday_inventory_settings s
        SET erp_leading = true, erp_leading_at = now(), updated_by = auth.uid(), updated_at = now()
      WHERE s.connection_id = p_connection_id AND s.product_id = v_pid;
+    -- Floriday-orders van voor de overstap zitten al in de Floriday-stand: nooit nog eens afboeken.
+    PERFORM public.voorraad_mark_floriday_sold_before_switch(v_pid);
+    PERFORM public.recompute_reserved_stock((SELECT COALESCE(NULLIF(btrim(p.floriday_trade_item_id),''), p.trade_item_key) FROM public.products p WHERE p.id = v_pid));
     PERFORM public.floriday_recompute_inventory(p_connection_id, v_pid, true);
     v_n := v_n + 1;
   END LOOP;
@@ -4479,6 +4508,128 @@ END $function$
 ;
 REVOKE ALL ON FUNCTION product_own_available(uuid,uuid) FROM PUBLIC;
 GRANT EXECUTE ON FUNCTION product_own_available(uuid,uuid) TO service_role;
+CREATE OR REPLACE FUNCTION public.product_packings_derive(p_product_id uuid)
+ RETURNS void
+ LANGUAGE plpgsql
+ SECURITY DEFINER
+ SET search_path TO 'public'
+AS $function$
+DECLARE r record; v_nullable boolean;
+BEGIN
+  SELECT * INTO r FROM public.product_packings WHERE product_id = p_product_id AND is_primary LIMIT 1;
+  IF FOUND AND r.pieces_per_package > 0 AND r.packages_per_layer > 0 AND r.layers_per_load_carrier > 0 THEN
+    UPDATE public.products SET
+      plants_per_crate = r.pieces_per_package,
+      crates_per_layer = r.packages_per_layer,
+      layers_per_cart = r.layers_per_load_carrier,
+      fust_type_id = r.fust_type_id,
+      floriday_packing_confirmed_at = now(),
+      floriday_packing_source = 'product_packings:' || r.source
+    WHERE id = p_product_id;
+  ELSE
+    -- Onvolledig: niets verzinnen. Kolommen leeg als core dat toestaat, anders alleen "onbekend" markeren.
+    SELECT NOT attnotnull INTO v_nullable FROM pg_attribute
+      WHERE attrelid = 'public.products'::regclass AND attname = 'plants_per_crate';
+    IF v_nullable THEN
+      EXECUTE 'UPDATE public.products SET plants_per_crate = NULL, crates_per_layer = NULL, layers_per_cart = NULL WHERE id = $1' USING p_product_id;
+    END IF;
+    UPDATE public.products SET floriday_packing_confirmed_at = NULL, floriday_packing_source = NULL,
+      fust_type_id = CASE WHEN FOUND THEN r.fust_type_id ELSE fust_type_id END
+    WHERE id = p_product_id;
+  END IF;
+END $function$
+;
+REVOKE ALL ON FUNCTION product_packings_derive(uuid) FROM PUBLIC;
+GRANT EXECUTE ON FUNCTION product_packings_derive(uuid) TO service_role;
+CREATE OR REPLACE FUNCTION public.product_packings_replace(p_product_id uuid, p_source text, p_packings jsonb)
+ RETURNS integer
+ LANGUAGE plpgsql
+ SET search_path TO 'public'
+AS $function$
+DECLARE n integer;
+BEGIN
+  IF p_source NOT IN ('floriday','eigen') THEN RAISE EXCEPTION 'Onbekende verpakkingsbron %', p_source; END IF;
+  DELETE FROM public.product_packings WHERE product_id = p_product_id;
+  INSERT INTO public.product_packings(product_id, source, floriday_packing_id, vbn_package_code, custom_package_id,
+    fust_type_id, load_carrier, pieces_per_package, packages_per_layer, layers_per_load_carrier, is_primary,
+    customer_organization_ids, sort_order)
+  SELECT p_product_id, p_source, NULLIF(e->>'floriday_packing_id',''), NULLIF(e->>'vbn_package_code','')::int,
+    NULLIF(e->>'custom_package_id',''), NULLIF(e->>'fust_type_id','')::uuid, NULLIF(e->>'load_carrier',''),
+    NULLIF(NULLIF(e->>'pieces_per_package',''),'0')::int, NULLIF(NULLIF(e->>'packages_per_layer',''),'0')::int,
+    NULLIF(NULLIF(e->>'layers_per_load_carrier',''),'0')::int, COALESCE((e->>'is_primary')::boolean,false),
+    COALESCE(ARRAY(SELECT jsonb_array_elements_text(e->'customer_organization_ids')), '{}'), (o - 1)::int
+  FROM jsonb_array_elements(COALESCE(p_packings,'[]'::jsonb)) WITH ORDINALITY AS t(e, o);
+  GET DIAGNOSTICS n = ROW_COUNT;
+  RETURN n;
+END $function$
+;
+REVOKE ALL ON FUNCTION product_packings_replace(uuid,text,jsonb) FROM PUBLIC;
+GRANT EXECUTE ON FUNCTION product_packings_replace(uuid,text,jsonb) TO PUBLIC;
+GRANT EXECUTE ON FUNCTION product_packings_replace(uuid,text,jsonb) TO anon;
+GRANT EXECUTE ON FUNCTION product_packings_replace(uuid,text,jsonb) TO authenticated;
+GRANT EXECUTE ON FUNCTION product_packings_replace(uuid,text,jsonb) TO service_role;
+CREATE OR REPLACE FUNCTION public.product_packings_sync_from_floriday(p_connection_id uuid, p_product_ids uuid[], p_only_existing boolean DEFAULT false)
+ RETURNS jsonb
+ LANGUAGE plpgsql
+ SET search_path TO 'public'
+AS $function$
+DECLARE r record; v_list jsonb; n_done int := 0; n_missing int := 0;
+BEGIN
+  FOR r IN
+    SELECT p.id, c.data
+      FROM public.products p
+      JOIN public.floriday_trade_items_cache c
+        ON c.connection_id = p_connection_id AND c.floriday_id = NULLIF(btrim(p.floriday_trade_item_id),'')
+       AND COALESCE(c.is_deleted,false) = false
+     WHERE p.id = ANY(p_product_ids)
+       AND (NOT p_only_existing OR EXISTS (SELECT 1 FROM public.product_packings x WHERE x.product_id = p.id AND x.source = 'floriday'))
+  LOOP
+    IF jsonb_typeof(r.data->'packingConfigurations') <> 'array' OR jsonb_array_length(r.data->'packingConfigurations') = 0 THEN
+      n_missing := n_missing + 1; CONTINUE;
+    END IF;
+    SELECT jsonb_agg(jsonb_build_object(
+      'floriday_packing_id', COALESCE(e->>'packingConfigurationId', e->>'id'),
+      'vbn_package_code', e#>>'{package,vbnPackageCode}',
+      'custom_package_id', e#>>'{package,customPackageId}',
+      'fust_type_id', (SELECT f.id FROM public.fust_types f WHERE f.connection_id IS NULL
+                        AND f.vbn_code IS NOT NULL AND f.vbn_code::text = e#>>'{package,vbnPackageCode}' LIMIT 1),
+      'load_carrier', e->>'loadCarrier',
+      'pieces_per_package', e->>'piecesPerPackage',
+      'packages_per_layer', e->>'packagesPerLayer',
+      'layers_per_load_carrier', e->>'layersPerLoadCarrier',
+      'is_primary', COALESCE((e->>'primary')::boolean, false),
+      'customer_organization_ids', COALESCE(e->'allowedCustomerOrganizationIds', '[]'::jsonb)) ORDER BY o)
+      INTO v_list
+      FROM jsonb_array_elements(r.data->'packingConfigurations') WITH ORDINALITY t(e, o)
+     WHERE jsonb_typeof(e) = 'object';
+    PERFORM public.product_packings_replace(r.id, 'floriday', v_list);
+    n_done := n_done + 1;
+  END LOOP;
+  RETURN jsonb_build_object('copied', n_done, 'no_packings_in_floriday', n_missing);
+END $function$
+;
+REVOKE ALL ON FUNCTION product_packings_sync_from_floriday(uuid,uuid[],boolean) FROM PUBLIC;
+GRANT EXECUTE ON FUNCTION product_packings_sync_from_floriday(uuid,uuid[],boolean) TO PUBLIC;
+GRANT EXECUTE ON FUNCTION product_packings_sync_from_floriday(uuid,uuid[],boolean) TO anon;
+GRANT EXECUTE ON FUNCTION product_packings_sync_from_floriday(uuid,uuid[],boolean) TO authenticated;
+GRANT EXECUTE ON FUNCTION product_packings_sync_from_floriday(uuid,uuid[],boolean) TO service_role;
+CREATE OR REPLACE FUNCTION public.product_primary_pieces(p_product_id uuid)
+ RETURNS integer
+ LANGUAGE sql
+ STABLE
+ SET search_path TO 'public'
+AS $function$
+  SELECT pp.pieces_per_package FROM public.product_packings pp
+   WHERE pp.product_id = p_product_id AND pp.is_primary
+     AND pp.pieces_per_package > 0 AND pp.packages_per_layer > 0 AND pp.layers_per_load_carrier > 0
+   LIMIT 1
+$function$
+;
+REVOKE ALL ON FUNCTION product_primary_pieces(uuid) FROM PUBLIC;
+GRANT EXECUTE ON FUNCTION product_primary_pieces(uuid) TO PUBLIC;
+GRANT EXECUTE ON FUNCTION product_primary_pieces(uuid) TO anon;
+GRANT EXECUTE ON FUNCTION product_primary_pieces(uuid) TO authenticated;
+GRANT EXECUTE ON FUNCTION product_primary_pieces(uuid) TO service_role;
 CREATE OR REPLACE FUNCTION public.product_set_depth_above(p_product_id uuid, p_path uuid[] DEFAULT '{}'::uuid[])
  RETURNS integer
  LANGUAGE plpgsql
@@ -4803,6 +4954,17 @@ BEGIN
    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';
 
+  -- Floriday-leidend: Floriday-orders reserveren niet (Floriday heeft de verkoop al afgetrokken).
+  DELETE FROM _reserved_demand WHERE true;
+  INSERT INTO _reserved_demand
+  SELECT a.trade_item_key, SUM(a.qty)
+    FROM _reserved_alloc a
+    LEFT JOIN logistics_active.order_items oi ON oi.id = a.order_item_id
+    LEFT JOIN public.orders o ON o.id = oi.order_id
+   WHERE NOT (public.normalize_order_source(o.order_source) = 'FO'
+              AND public.voorraad_floriday_leads_key(a.trade_item_key))
+   GROUP BY a.trade_item_key;
+
   PERFORM set_config('stock.change_source', 'RESERVATION_RECOMPUTE', true);
   UPDATE public.trade_item_stock s
      SET reserved_stock = CEIL(COALESCE(d.qty, 0))::integer,
@@ -4934,6 +5096,7 @@ DECLARE
   v_sum integer;
   v_products uuid[];
   v_pid uuid;
+  v_leads boolean;
 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;
@@ -4988,6 +5151,7 @@ BEGIN
     RETURN;
   END IF;
 
+  v_leads := public.voorraad_floriday_leads_key(v_key);
   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
@@ -4995,6 +5159,7 @@ BEGIN
    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 (public.normalize_order_source(o.order_source) = 'FO' AND v_leads)
      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))
@@ -6683,6 +6848,22 @@ END $function$
 ;
 REVOKE ALL ON FUNCTION trg_process_recompute_on_commit() FROM PUBLIC;
 GRANT EXECUTE ON FUNCTION trg_process_recompute_on_commit() TO service_role;
+CREATE OR REPLACE FUNCTION public.trg_product_packings_derive_fn()
+ RETURNS trigger
+ LANGUAGE plpgsql
+ SECURITY DEFINER
+ SET search_path TO 'public'
+AS $function$
+BEGIN
+  IF TG_OP IN ('UPDATE','DELETE') THEN PERFORM public.product_packings_derive(OLD.product_id); END IF;
+  IF TG_OP IN ('INSERT','UPDATE') AND (TG_OP = 'INSERT' OR NEW.product_id <> OLD.product_id) THEN
+    PERFORM public.product_packings_derive(NEW.product_id);
+  END IF;
+  RETURN NULL;
+END $function$
+;
+REVOKE ALL ON FUNCTION trg_product_packings_derive_fn() FROM PUBLIC;
+GRANT EXECUTE ON FUNCTION trg_product_packings_derive_fn() TO service_role;
 CREATE OR REPLACE FUNCTION public.trg_products_autolink_fn()
  RETURNS trigger
  LANGUAGE plpgsql
@@ -7284,6 +7465,30 @@ REVOKE ALL ON FUNCTION update_updated_at_column() FROM PUBLIC;
 GRANT EXECUTE ON FUNCTION update_updated_at_column() TO anon;
 GRANT EXECUTE ON FUNCTION update_updated_at_column() TO authenticated;
 GRANT EXECUTE ON FUNCTION update_updated_at_column() TO service_role;
+CREATE OR REPLACE FUNCTION public.voorraad_alert_floriday_not_updated(p_key text, p_qty numeric, p_order_id uuid, p_order_item_id uuid)
+ RETURNS void
+ LANGUAGE plpgsql
+ SECURITY DEFINER
+ SET search_path TO 'public'
+AS $function$
+DECLARE v_code text; v_name text; v_nr text; v_tx bigint := -(txid_current() + 1125899906842624);
+BEGIN
+  SELECT p.article_number, p.product INTO v_code, v_name FROM public.products p
+   WHERE lower(p.floriday_trade_item_id) = lower(p_key) OR p.trade_item_key = p_key OR 'product:' || p.id::text = p_key OR p.id::text = p_key
+   LIMIT 1;
+  BEGIN EXECUTE 'SELECT order_number::text FROM public.orders WHERE id = $1' INTO v_nr USING p_order_id;
+  EXCEPTION WHEN others THEN v_nr := NULL; END;
+  INSERT INTO public.stock_integrity_alerts(tx_id, alert_kind, item_count, items)
+  VALUES (v_tx, 'FLORIDAY_NOT_UPDATED', 1, jsonb_build_array(jsonb_build_object(
+    'trade_item_key', p_key, 'article_code', v_code, 'name', v_name, 'qty', p_qty,
+    'order_id', p_order_id, 'order_item_id', p_order_item_id, 'order_number', v_nr, 'physical_before', NULL, 'change_source', 'ORDER_DELIVERY')))
+  ON CONFLICT (tx_id) DO UPDATE SET item_count = public.stock_integrity_alerts.item_count + 1,
+    items = public.stock_integrity_alerts.items || EXCLUDED.items, updated_at = now();
+EXCEPTION WHEN others THEN RAISE WARNING '[floriday-not-updated-alert] %', SQLERRM;
+END $function$
+;
+REVOKE ALL ON FUNCTION voorraad_alert_floriday_not_updated(text,numeric,uuid,uuid) FROM PUBLIC;
+GRANT EXECUTE ON FUNCTION voorraad_alert_floriday_not_updated(text,numeric,uuid,uuid) TO service_role;
 CREATE OR REPLACE FUNCTION public.voorraad_can_write()
  RETURNS boolean
  LANGUAGE sql
@@ -7380,6 +7585,23 @@ GRANT EXECUTE ON FUNCTION voorraad_external_fulfilled_ids(jsonb) TO PUBLIC;
 GRANT EXECUTE ON FUNCTION voorraad_external_fulfilled_ids(jsonb) TO anon;
 GRANT EXECUTE ON FUNCTION voorraad_external_fulfilled_ids(jsonb) TO authenticated;
 GRANT EXECUTE ON FUNCTION voorraad_external_fulfilled_ids(jsonb) TO service_role;
+CREATE OR REPLACE FUNCTION public.voorraad_floriday_leads_key(p_key text)
+ RETURNS boolean
+ LANGUAGE sql
+ STABLE SECURITY DEFINER
+ SET search_path TO 'public'
+AS $function$
+  SELECT CASE WHEN p_key IS NULL OR btrim(p_key) = '' THEN false ELSE EXISTS (
+    SELECT 1 FROM public.products p
+      JOIN public.floriday_inventory_settings s ON s.product_id = p.id AND s.erp_leading = false
+     WHERE (lower(p.floriday_trade_item_id) = lower(btrim(p_key)) OR p.trade_item_key = btrim(p_key)
+            OR p.id::text = btrim(p_key) OR 'product:' || p.id::text = btrim(p_key))
+       AND s.connection_id = COALESCE((SELECT c.connection_id FROM public.get_active_floriday_context() c), s.connection_id)
+  ) END
+$function$
+;
+REVOKE ALL ON FUNCTION voorraad_floriday_leads_key(text) FROM PUBLIC;
+GRANT EXECUTE ON FUNCTION voorraad_floriday_leads_key(text) TO service_role;
 CREATE OR REPLACE FUNCTION public.voorraad_hook_base_url()
  RETURNS text
  LANGUAGE plpgsql
@@ -7485,6 +7707,35 @@ END $function$
 ;
 REVOKE ALL ON FUNCTION voorraad_hook_switch_jobs() FROM PUBLIC;
 GRANT EXECUTE ON FUNCTION voorraad_hook_switch_jobs() TO service_role;
+CREATE OR REPLACE FUNCTION public.voorraad_mark_floriday_sold_before_switch(p_product_id uuid)
+ RETURNS integer
+ LANGUAGE plpgsql
+ SECURITY DEFINER
+ SET search_path TO 'public'
+AS $function$
+DECLARE r record; n int := 0; v_key text;
+BEGIN
+  SELECT COALESCE(NULLIF(btrim(p.floriday_trade_item_id),''), p.trade_item_key, 'product:'||p.id::text) INTO v_key
+    FROM public.products p WHERE p.id = p_product_id;
+  FOR r IN
+    SELECT oi.id, oi.order_id
+      FROM logistics_active.order_items oi JOIN public.orders o ON o.id = oi.order_id
+     WHERE oi.product_id = p_product_id
+       AND public.normalize_order_source(o.order_source) = 'FO'
+       AND NOT EXISTS (SELECT 1 FROM public.stock_mutation_log m WHERE m.order_item_id = oi.id AND m.mutation_type = 'consumption')
+  LOOP
+    INSERT INTO public.stock_mutation_log(order_id, order_item_id, order_source, mutation_type, qty_delta, reason, created_by)
+    VALUES (r.order_id, r.id, 'FO', 'consumption_done', 0, 'Verwerkt in Floriday-stand', auth.uid())
+    ON CONFLICT (order_item_id) WHERE mutation_type = 'consumption_done' AND order_item_id IS NOT NULL DO NOTHING;
+    INSERT INTO public.stock_mutation_log(trade_item_key, order_id, order_item_id, order_source, mutation_type, qty_delta, reason, created_by)
+    VALUES (v_key, r.order_id, r.id, 'FO', 'consumption', 0, 'Verwerkt in Floriday-stand bij overstap naar eigen voorraad leidend (niet opnieuw afgeboekt)', auth.uid());
+    n := n + 1;
+  END LOOP;
+  RETURN n;
+END $function$
+;
+REVOKE ALL ON FUNCTION voorraad_mark_floriday_sold_before_switch(uuid) FROM PUBLIC;
+GRANT EXECUTE ON FUNCTION voorraad_mark_floriday_sold_before_switch(uuid) TO service_role;
 CREATE OR REPLACE FUNCTION public.voorraad_production_enabled()
  RETURNS boolean
  LANGUAGE sql
@@ -7650,6 +7901,7 @@ DO $c$ BEGIN IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'invento
 DO $c$ BEGIN IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'inventory_stock_snapshots_pkey' AND conrelid = 'public.inventory_stock_snapshots'::regclass) THEN ALTER TABLE public.inventory_stock_snapshots ADD CONSTRAINT inventory_stock_snapshots_pkey PRIMARY KEY (id); END IF; END $c$;
 DO $c$ BEGIN IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'order_fust_bookings_pkey' AND conrelid = 'public.order_fust_bookings'::regclass) THEN ALTER TABLE public.order_fust_bookings ADD CONSTRAINT order_fust_bookings_pkey PRIMARY KEY (id); END IF; END $c$;
 DO $c$ BEGIN IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'product_merge_log_pkey' AND conrelid = 'public.product_merge_log'::regclass) THEN ALTER TABLE public.product_merge_log ADD CONSTRAINT product_merge_log_pkey PRIMARY KEY (id); END IF; END $c$;
+DO $c$ BEGIN IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'product_packings_pkey' AND conrelid = 'public.product_packings'::regclass) THEN ALTER TABLE public.product_packings ADD CONSTRAINT product_packings_pkey PRIMARY KEY (id); END IF; END $c$;
 DO $c$ BEGIN IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'product_tray_stickers_pkey' AND conrelid = 'public.product_tray_stickers'::regclass) THEN ALTER TABLE public.product_tray_stickers ADD CONSTRAINT product_tray_stickers_pkey PRIMARY KEY (product_id); END IF; END $c$;
 DO $c$ BEGIN IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'stock_import_chunks_pkey' AND conrelid = 'public.stock_import_chunks'::regclass) THEN ALTER TABLE public.stock_import_chunks ADD CONSTRAINT stock_import_chunks_pkey PRIMARY KEY (run_id, chunk_no); END IF; END $c$;
 DO $c$ BEGIN IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'stock_import_rows_pkey' AND conrelid = 'public.stock_import_rows'::regclass) THEN ALTER TABLE public.stock_import_rows ADD CONSTRAINT stock_import_rows_pkey PRIMARY KEY (id); END IF; END $c$;
@@ -7710,6 +7962,10 @@ ALTER TABLE public.inventory_recompute_limits DROP CONSTRAINT IF EXISTS inventor
 ALTER TABLE public.inventory_recompute_limits ADD CONSTRAINT inventory_recompute_limits_max_parents_inline_check CHECK ((max_parents_inline >= 0));
 ALTER TABLE public.inventory_stock_snapshots DROP CONSTRAINT IF EXISTS inventory_stock_snapshots_gran_check;
 ALTER TABLE public.inventory_stock_snapshots ADD CONSTRAINT inventory_stock_snapshots_gran_check CHECK ((granularity = ANY (ARRAY['hour'::text, 'day'::text])));
+ALTER TABLE public.product_packings DROP CONSTRAINT IF EXISTS product_packings_positive_check;
+ALTER TABLE public.product_packings ADD CONSTRAINT product_packings_positive_check CHECK ((((pieces_per_package IS NULL) OR (pieces_per_package > 0)) AND ((packages_per_layer IS NULL) OR (packages_per_layer > 0)) AND ((layers_per_load_carrier IS NULL) OR (layers_per_load_carrier > 0))));
+ALTER TABLE public.product_packings DROP CONSTRAINT IF EXISTS product_packings_source_check;
+ALTER TABLE public.product_packings ADD CONSTRAINT product_packings_source_check CHECK ((source = ANY (ARRAY['floriday'::text, 'eigen'::text])));
 ALTER TABLE public.stock_import_chunks DROP CONSTRAINT IF EXISTS stock_import_chunks_status_check;
 ALTER TABLE public.stock_import_chunks ADD CONSTRAINT stock_import_chunks_status_check CHECK ((status = ANY (ARRAY['wacht'::text, 'klaar'::text, 'ongedaan'::text])));
 ALTER TABLE public.stock_import_rows DROP CONSTRAINT IF EXISTS stock_import_rows_status_check;
@@ -7717,7 +7973,7 @@ ALTER TABLE public.stock_import_rows ADD CONSTRAINT stock_import_rows_status_che
 ALTER TABLE public.stock_import_runs DROP CONSTRAINT IF EXISTS stock_import_runs_status_check;
 ALTER TABLE public.stock_import_runs ADD CONSTRAINT stock_import_runs_status_check CHECK ((status = ANY (ARRAY['ontvangen'::text, 'bezig'::text, 'gestopt'::text, 'voltooid'::text, 'ongedaan'::text, 'deels_ongedaan'::text])));
 ALTER TABLE public.stock_integrity_alerts DROP CONSTRAINT IF EXISTS stock_integrity_alerts_kind_check;
-ALTER TABLE public.stock_integrity_alerts ADD CONSTRAINT stock_integrity_alerts_kind_check CHECK ((alert_kind = ANY (ARRAY['ZERO_BATCH'::text, 'NEGATIVE_STOCK'::text])));
+ALTER TABLE public.stock_integrity_alerts ADD CONSTRAINT stock_integrity_alerts_kind_check CHECK ((alert_kind = ANY (ARRAY['ZERO_BATCH'::text, 'NEGATIVE_STOCK'::text, 'FLORIDAY_NOT_UPDATED'::text])));
 ALTER TABLE public.stock_mutation_log DROP CONSTRAINT IF EXISTS stock_mutation_log_mutation_type_check;
 ALTER TABLE public.stock_mutation_log ADD CONSTRAINT stock_mutation_log_mutation_type_check CHECK ((mutation_type = ANY (ARRAY['reservation'::text, 'reservation_release'::text, 'consumption'::text, 'stock_check'::text, 'reservation_skipped'::text, 'consumption_skipped'::text, 'consumption_blocked'::text, 'production_consume'::text, 'production_output'::text, 'production_reverse'::text, 'manual_correction'::text, 'order_sync'::text, 'import'::text, 'production'::text, 'stock_update'::text, 'reservation_recompute'::text, 'unknown'::text, 'consumption_done'::text, 'new_article'::text])));
 ALTER TABLE public.trade_item_drafts DROP CONSTRAINT IF EXISTS trade_item_drafts_link_status_chk;
@@ -7727,6 +7983,8 @@ DO $c$ BEGIN IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'florida
 DO $c$ BEGIN IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'floriday_vbn_required_characteristics_updated_by_fkey' AND conrelid = 'public.floriday_vbn_required_characteristics'::regclass) THEN ALTER TABLE public.floriday_vbn_required_characteristics ADD CONSTRAINT floriday_vbn_required_characteristics_updated_by_fkey FOREIGN KEY (updated_by) REFERENCES auth.users(id) ON DELETE SET NULL; END IF; END $c$;
 DO $c$ BEGIN IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'fust_stock_mutations_fust_type_id_fkey' AND conrelid = 'public.fust_stock_mutations'::regclass) THEN ALTER TABLE public.fust_stock_mutations ADD CONSTRAINT fust_stock_mutations_fust_type_id_fkey FOREIGN KEY (fust_type_id) REFERENCES fust_types(id) ON DELETE CASCADE; END IF; END $c$;
 DO $c$ BEGIN IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'order_fust_bookings_fust_type_id_fkey' AND conrelid = 'public.order_fust_bookings'::regclass) THEN ALTER TABLE public.order_fust_bookings ADD CONSTRAINT order_fust_bookings_fust_type_id_fkey FOREIGN KEY (fust_type_id) REFERENCES fust_types(id) ON DELETE CASCADE; END IF; END $c$;
+DO $c$ BEGIN IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'product_packings_fust_type_id_fkey' AND conrelid = 'public.product_packings'::regclass) THEN ALTER TABLE public.product_packings ADD CONSTRAINT product_packings_fust_type_id_fkey FOREIGN KEY (fust_type_id) REFERENCES fust_types(id) ON DELETE SET NULL; END IF; END $c$;
+DO $g$ BEGIN IF to_regclass('public.products') IS NULL THEN RAISE NOTICE 'Voorraad: products (core) ontbreekt, controles overgeslagen; draai de schema-update opnieuw na die module'; ELSE EXECUTE $q$DO $c$ BEGIN IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'product_packings_product_id_fkey' AND conrelid = 'public.product_packings'::regclass) THEN ALTER TABLE public.product_packings ADD CONSTRAINT product_packings_product_id_fkey FOREIGN KEY (product_id) REFERENCES products(id) ON DELETE CASCADE; END IF; END $c$$q$; END IF; END $g$;
 DO $g$ BEGIN IF to_regclass('public.products') IS NULL THEN RAISE NOTICE 'Voorraad: products (core) ontbreekt, controles overgeslagen; draai de schema-update opnieuw na die module'; ELSE EXECUTE $q$DO $c$ BEGIN IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'product_tray_stickers_product_id_fkey' AND conrelid = 'public.product_tray_stickers'::regclass) THEN ALTER TABLE public.product_tray_stickers ADD CONSTRAINT product_tray_stickers_product_id_fkey FOREIGN KEY (product_id) REFERENCES products(id) ON DELETE CASCADE; END IF; END $c$$q$; END IF; END $g$;
 DO $c$ BEGIN IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'stock_import_chunks_run_id_fkey' AND conrelid = 'public.stock_import_chunks'::regclass) THEN ALTER TABLE public.stock_import_chunks ADD CONSTRAINT stock_import_chunks_run_id_fkey FOREIGN KEY (run_id) REFERENCES stock_import_runs(id) ON DELETE CASCADE; END IF; END $c$;
 DO $c$ BEGIN IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'stock_import_rows_run_id_fkey' AND conrelid = 'public.stock_import_rows'::regclass) THEN ALTER TABLE public.stock_import_rows ADD CONSTRAINT stock_import_rows_run_id_fkey FOREIGN KEY (run_id) REFERENCES stock_import_runs(id) ON DELETE CASCADE; END IF; END $c$;
@@ -7759,6 +8017,7 @@ CREATE INDEX IF NOT EXISTS idx_voorraad_buffer_state_closed_at ON public.voorraa
 CREATE INDEX IF NOT EXISTS idx_voorraad_event_log_processed_at ON public.voorraad_logistics_event_log USING btree (processed_at DESC);
 CREATE INDEX IF NOT EXISTS idx_voorraad_publish_attempts_user_created ON public.voorraad_publish_attempts USING btree (user_id, created_at DESC);
 CREATE INDEX IF NOT EXISTS inventory_stock_snapshots_time_idx ON public.inventory_stock_snapshots USING btree (connection_id, snapshot_at DESC);
+CREATE INDEX IF NOT EXISTS product_packings_product_idx ON public.product_packings USING btree (product_id);
 CREATE INDEX IF NOT EXISTS stock_import_rows_chunk_idx ON public.stock_import_rows USING btree (run_id, chunk_no);
 CREATE INDEX IF NOT EXISTS stock_import_runs_hash_idx ON public.stock_import_runs USING btree (file_hash) WHERE (file_hash IS NOT NULL);
 CREATE INDEX IF NOT EXISTS stock_import_runs_user_created_idx ON public.stock_import_runs USING btree (user_id, created_at DESC);
@@ -7767,6 +8026,7 @@ CREATE INDEX IF NOT EXISTS trade_item_prices_lookup ON public.trade_item_prices
 CREATE INDEX IF NOT EXISTS trade_item_stock_trade_item_key_idx ON public.trade_item_stock USING btree (trade_item_key);
 CREATE UNIQUE INDEX IF NOT EXISTS fcsq_one_open_per_week ON public.floriday_continuous_stock_queue USING btree (connection_id, trade_item_id, COALESCE(target_year, '-1'::integer), COALESCE(target_week, '-1'::integer)) WHERE (status = ANY (ARRAY['pending'::text, 'needs_base_supply'::text, 'skipped_no_price'::text, 'failed'::text]));
 CREATE UNIQUE INDEX IF NOT EXISTS fust_types_user_key_global_idx ON public.fust_types USING btree (user_id, fust_key) WHERE (connection_id IS NULL);
+CREATE UNIQUE INDEX IF NOT EXISTS product_packings_one_primary ON public.product_packings USING btree (product_id) WHERE is_primary;
 CREATE UNIQUE INDEX IF NOT EXISTS stock_import_runs_one_active ON public.stock_import_runs USING btree (COALESCE(connection_id, '00000000-0000-0000-0000-000000000000'::uuid)) WHERE (status = ANY (ARRAY['ontvangen'::text, 'bezig'::text, 'gestopt'::text]));
 CREATE UNIQUE INDEX IF NOT EXISTS trade_item_prices_group_item_uidx ON public.trade_item_prices USING btree (price_group_id, trade_item_key) WHERE (price_group_id IS NOT NULL);
 CREATE UNIQUE INDEX IF NOT EXISTS trade_item_prices_unique_base ON public.trade_item_prices USING btree (user_id, trade_item_key) WHERE (price_group_id IS NULL);
@@ -7842,6 +8102,10 @@ ALTER TABLE public.product_merge_log ENABLE ROW LEVEL SECURITY;
 GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON public.product_merge_log TO anon;
 GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON public.product_merge_log TO authenticated;
 GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON public.product_merge_log TO service_role;
+ALTER TABLE public.product_packings ENABLE ROW LEVEL SECURITY;
+GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON public.product_packings TO anon;
+GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON public.product_packings TO authenticated;
+GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON public.product_packings TO service_role;
 ALTER TABLE public.product_tray_stickers ENABLE ROW LEVEL SECURITY;
 GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON public.product_tray_stickers TO anon;
 GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON public.product_tray_stickers TO authenticated;
@@ -7974,6 +8238,10 @@ DROP POLICY IF EXISTS "authenticated can insert merge log" ON public.product_mer
 CREATE POLICY "authenticated can insert merge log" ON public.product_merge_log AS PERMISSIVE FOR INSERT TO authenticated WITH CHECK (true);
 DROP POLICY IF EXISTS "authenticated can read merge log" ON public.product_merge_log;
 CREATE POLICY "authenticated can read merge log" ON public.product_merge_log AS PERMISSIVE FOR SELECT TO authenticated USING (true);
+DROP POLICY IF EXISTS product_packings_read ON public.product_packings;
+CREATE POLICY product_packings_read ON public.product_packings AS PERMISSIVE FOR SELECT TO authenticated USING (true);
+DROP POLICY IF EXISTS product_packings_write ON public.product_packings;
+CREATE POLICY product_packings_write ON public.product_packings AS PERMISSIVE FOR ALL TO authenticated USING (voorraad_can_write()) WITH CHECK (voorraad_can_write());
 DROP POLICY IF EXISTS "Ingelogden beheren traystickers" ON public.product_tray_stickers;
 CREATE POLICY "Ingelogden beheren traystickers" ON public.product_tray_stickers AS PERMISSIVE FOR ALL TO authenticated USING (true) WITH CHECK (true);
 DROP POLICY IF EXISTS "Eigenaar leest importporties" ON public.stock_import_chunks;
@@ -8117,6 +8385,10 @@ DO $g$ BEGIN IF to_regclass('public.product_group_items') IS NULL THEN RAISE NOT
 DO $g$ BEGIN IF to_regclass('public.product_group_items') IS NULL THEN RAISE NOTICE 'Voorraad: product_group_items (core) ontbreekt, triggers overgeslagen; draai de schema-update opnieuw na die module'; ELSE EXECUTE $q$CREATE TRIGGER trg_structure_change_recompute AFTER INSERT OR DELETE OR UPDATE ON public.product_group_items FOR EACH ROW EXECUTE FUNCTION trg_structure_change_recompute()$q$; END IF; END $g$;
 DO $g$ BEGIN IF to_regclass('public.product_groups') IS NULL THEN RAISE NOTICE 'Voorraad: product_groups (core) ontbreekt, triggers overgeslagen; draai de schema-update opnieuw na die module'; ELSE EXECUTE $q$CREATE TRIGGER trg_check_product_structure BEFORE INSERT OR UPDATE ON public.product_groups FOR EACH ROW EXECUTE FUNCTION trg_check_product_structure()$q$; END IF; END $g$;
 DO $g$ BEGIN IF to_regclass('public.product_groups') IS NULL THEN RAISE NOTICE 'Voorraad: product_groups (core) ontbreekt, triggers overgeslagen; draai de schema-update opnieuw na die module'; ELSE EXECUTE $q$CREATE TRIGGER trg_structure_change_recompute AFTER INSERT OR DELETE OR UPDATE OF is_active, head_product_id, head_trade_item_floriday_id ON public.product_groups FOR EACH ROW EXECUTE FUNCTION trg_structure_change_recompute()$q$; END IF; END $g$;
+DROP TRIGGER IF EXISTS product_packings_derive_trg ON public.product_packings;
+CREATE TRIGGER product_packings_derive_trg AFTER INSERT OR DELETE OR UPDATE ON public.product_packings FOR EACH ROW EXECUTE FUNCTION trg_product_packings_derive_fn();
+DROP TRIGGER IF EXISTS product_packings_updated_at ON public.product_packings;
+CREATE TRIGGER product_packings_updated_at BEFORE UPDATE ON public.product_packings FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
 DROP TRIGGER IF EXISTS trg_product_tray_stickers_touch ON public.product_tray_stickers;
 CREATE TRIGGER trg_product_tray_stickers_touch BEFORE UPDATE ON public.product_tray_stickers FOR EACH ROW EXECUTE FUNCTION product_tray_stickers_touch();
 DO $g$ BEGIN IF to_regclass('public.products') IS NULL THEN RAISE NOTICE 'Voorraad: products (core) ontbreekt, triggers overgeslagen; draai de schema-update opnieuw na die module'; ELSE EXECUTE $q$CREATE TRIGGER trg_floriday_ensure_inventory_settings AFTER INSERT ON public.products FOR EACH ROW EXECUTE FUNCTION floriday_ensure_inventory_settings()$q$; END IF; END $g$;