@flowselections/floriday-voorraad 1.0.110 → 1.0.115

package/sql/floriday-voorraad-schema.sql

@@ -1,4 +1,4 @@
--- @flowselections/floriday-voorraad 1.0.109 – volledig schema (idempotent, geen gegevens).
+-- @flowselections/floriday-voorraad 1.0.112 – 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.
@@ -209,6 +209,7 @@ ALTER TABLE public.fust_types ADD COLUMN IF NOT EXISTS length_mm integer;
 ALTER TABLE public.fust_types ADD COLUMN IF NOT EXISTS width_mm integer;
 ALTER TABLE public.fust_types ADD COLUMN IF NOT EXISTS height_mm integer;
 ALTER TABLE public.fust_types ADD COLUMN IF NOT EXISTS capacity_units integer;
+ALTER TABLE public.fust_types ADD COLUMN IF NOT EXISTS merged_into uuid;
 
 -- inventory_recompute_limits
 CREATE TABLE IF NOT EXISTS public.inventory_recompute_limits ();
@@ -4076,9 +4077,10 @@ CREATE OR REPLACE FUNCTION public.fust_types_duplicate_guard()
  SET search_path TO 'public'
 AS $function$
 BEGIN
-  IF EXISTS (SELECT 1 FROM public.fust_types f
+  IF NEW.merged_into IS NULL AND EXISTS (SELECT 1 FROM public.fust_types f
              WHERE f.fust_key = NEW.fust_key
                AND f.connection_id IS NOT DISTINCT FROM NEW.connection_id
+               AND f.merged_into IS NULL
                AND f.id <> NEW.id) THEN
     RAISE EXCEPTION 'Dit fusttype bestaat al (fustcode %).', NEW.fust_key USING ERRCODE = '23505';
   END IF;
@@ -7739,6 +7741,92 @@ END $function$
 REVOKE ALL ON FUNCTION voorraad_alert_floriday_not_updated(text,numeric,uuid,uuid) FROM PUBLIC;
 REVOKE ALL ON FUNCTION voorraad_alert_floriday_not_updated(text,numeric,uuid,uuid) FROM anon;
 GRANT EXECUTE ON FUNCTION voorraad_alert_floriday_not_updated(text,numeric,uuid,uuid) TO service_role;
+CREATE OR REPLACE FUNCTION public.voorraad_article_vbn(p_product_id uuid)
+ RETURNS jsonb
+ LANGUAGE plpgsql
+ STABLE SECURITY DEFINER
+ SET search_path TO 'public'
+AS $function$
+-- Leesfunctie voor de Engine: VBN-kenmerken en gekozen fust van één artikel, live gelezen, met bron.
+-- Volgorde: handmatige afwijking op products (plant_height_cm, fust_type_id) → lokale wizardgegevens
+-- (custom_fields.floriday_payload, als niet gekoppeld of nog niet doorgegeven) → Floriday-cache → lokale wizardgegevens.
+DECLARE
+  v_p record; v_pl jsonb; v_cache jsonb; v_dirty boolean; v_src text;
+  v_feat jsonb := '{}'::jsonb; v_vbn text; v_pack jsonb; v_fust_code text; v_fust_custom text;
+  v_s02 text; v_s02_src text; v_fust jsonb; v_fust_src text; v_ft uuid;
+BEGIN
+  PERFORM public.voorraad_vereis('ingelogd', 'voorraad_article_vbn');
+  SELECT id, custom_fields, floriday_trade_item_id, plant_height_cm, fust_type_id INTO v_p
+    FROM public.products WHERE id = p_product_id;
+  IF NOT FOUND THEN RETURN jsonb_build_object('ok', false, 'reason', 'Artikel niet gevonden'); END IF;
+
+  v_pl := v_p.custom_fields->'floriday_payload';
+  v_dirty := COALESCE((v_p.custom_fields->'floriday_sync'->>'dirty')::boolean, false);
+  IF v_p.floriday_trade_item_id IS NOT NULL THEN
+    SELECT c.data INTO v_cache FROM public.floriday_trade_items_cache c
+     WHERE c.floriday_id = v_p.floriday_trade_item_id::text AND COALESCE(c.is_deleted,false) = false
+     ORDER BY (c.connection_id IS NOT DISTINCT FROM (SELECT s.connection_id FROM public.get_stock_context() s)) DESC, c.fetched_at DESC NULLS LAST LIMIT 1;
+  END IF;
+
+  IF v_pl IS NOT NULL AND (v_cache IS NULL OR v_dirty) THEN
+    v_src := 'wizard';
+    v_vbn := v_pl->>'vbnCode';
+    v_feat := COALESCE(v_pl->'features', '{}'::jsonb);
+    SELECT e INTO v_pack FROM jsonb_array_elements(COALESCE(v_pl->'packingConfigurations','[]')) e
+      ORDER BY (COALESCE((e->>'isPrimary')::boolean,(e->>'primary')::boolean,false)) DESC LIMIT 1;
+    IF v_pack IS NOT NULL THEN
+      IF upper(COALESCE(v_pack->>'source','VBN')) = 'VBN' THEN v_fust_code := v_pack->>'packagingType';
+      ELSE v_fust_custom := v_pack->>'packagingType'; END IF;
+    END IF;
+  ELSIF v_cache IS NOT NULL THEN
+    v_src := 'floriday';
+    v_vbn := COALESCE(v_cache->>'vbnProductCode', v_cache->>'vbnCode');
+    SELECT COALESCE(jsonb_object_agg(e->>'vbnCode', e->>'vbnValueCode'), '{}'::jsonb) INTO v_feat
+      FROM jsonb_array_elements(CASE WHEN jsonb_typeof(v_cache->'characteristics')='array' THEN v_cache->'characteristics' ELSE '[]' END) e
+     WHERE e->>'vbnCode' IS NOT NULL;
+    SELECT e INTO v_pack FROM jsonb_array_elements(CASE WHEN jsonb_typeof(v_cache->'packingConfigurations')='array' THEN v_cache->'packingConfigurations' ELSE '[]' END) e
+      ORDER BY (COALESCE((e->>'primary')::boolean,(e->>'isPrimary')::boolean,false)) DESC LIMIT 1;
+    IF v_pack IS NOT NULL THEN
+      v_fust_code := v_pack->'package'->>'vbnPackageCode';
+      v_fust_custom := v_pack->'package'->>'customPackageId';
+    END IF;
+  ELSE
+    v_src := 'onbekend';
+  END IF;
+
+  -- S02 (planthoogte inclusief pot)
+  IF v_p.plant_height_cm IS NOT NULL THEN v_s02 := v_p.plant_height_cm::text; v_s02_src := 'handmatig';
+  ELSIF v_feat ? 'S02' THEN v_s02 := v_feat->>'S02'; v_s02_src := v_src;
+  END IF;
+
+  -- Fust
+  IF v_p.fust_type_id IS NOT NULL THEN v_ft := v_p.fust_type_id; v_fust_src := 'handmatig';
+  ELSIF v_fust_code IS NOT NULL OR v_fust_custom IS NOT NULL THEN
+    SELECT f.id INTO v_ft FROM public.fust_types f
+     WHERE f.connection_id IS NULL
+       AND ((v_fust_code IS NOT NULL AND f.fust_key = 'vbn:' || v_fust_code)
+         OR (v_fust_custom IS NOT NULL AND f.custom_package_id = v_fust_custom))
+     ORDER BY f.created_at, f.id LIMIT 1;
+    v_fust_src := v_src;
+  END IF;
+  IF v_ft IS NOT NULL THEN
+    SELECT to_jsonb(d) INTO v_fust FROM public.voorraad_fust_dimensions() d WHERE d.fust_type_id = v_ft;
+  END IF;
+  IF v_fust IS NULL AND (v_fust_code IS NOT NULL OR v_fust_custom IS NOT NULL) THEN
+    v_fust := jsonb_build_object('vbn_code', v_fust_code, 'custom_package_id', v_fust_custom, 'fust_type_id', NULL);
+  END IF;
+
+  RETURN jsonb_build_object(
+    'ok', true, 'product_id', v_p.id, 'source', v_src, 'vbn_code', v_vbn,
+    'features', v_feat,
+    's02', v_s02, 's02_source', v_s02_src,
+    'fust', v_fust, 'fust_source', v_fust_src);
+END $function$
+;
+REVOKE ALL ON FUNCTION voorraad_article_vbn(uuid) FROM PUBLIC;
+REVOKE ALL ON FUNCTION voorraad_article_vbn(uuid) FROM anon;
+GRANT EXECUTE ON FUNCTION voorraad_article_vbn(uuid) TO authenticated;
+GRANT EXECUTE ON FUNCTION voorraad_article_vbn(uuid) TO service_role;
 CREATE OR REPLACE FUNCTION public.voorraad_can_write()
  RETURNS boolean
  LANGUAGE sql
@@ -7977,6 +8065,66 @@ REVOKE ALL ON FUNCTION voorraad_correctie_1098(boolean) FROM PUBLIC;
 REVOKE ALL ON FUNCTION voorraad_correctie_1098(boolean) FROM anon;
 GRANT EXECUTE ON FUNCTION voorraad_correctie_1098(boolean) TO authenticated;
 GRANT EXECUTE ON FUNCTION voorraad_correctie_1098(boolean) TO service_role;
+CREATE OR REPLACE FUNCTION public.voorraad_correctie_1112(p_uitvoeren boolean DEFAULT false)
+ RETURNS jsonb
+ LANGUAGE plpgsql
+ SECURITY DEFINER
+ SET search_path TO 'public'
+AS $function$
+-- Samenvoegen dubbele fusttypen (zelfde fust_key, connection_id NULL, niet samengevoegd).
+-- Per fust_key: bewaar de rij met de meeste mutaties; maten aanvullen; minimum = hoogste;
+-- mutaties overzetten op id; voorraad optellen; andere rij in_use=false, stock 0, merged_into = bewaarde rij. Nooit verwijderen.
+DECLARE v jsonb; v_keep record; v_oth record; v_moved int; v_total int := 0;
+BEGIN
+  PERFORM public.voorraad_vereis('server', 'voorraad_correctie_1112');
+  WITH m AS (
+    SELECT f.*, (SELECT count(*) FROM public.fust_stock_mutations x WHERE x.fust_type_id = f.id) AS muts,
+           count(*) OVER (PARTITION BY f.fust_key) AS n
+      FROM public.fust_types f WHERE f.connection_id IS NULL AND f.merged_into IS NULL
+  ), q AS (
+    SELECT m.*, row_number() OVER (PARTITION BY fust_key ORDER BY muts DESC, created_at, id) AS rn FROM m WHERE n > 1
+  )
+  SELECT COALESCE(jsonb_agg(jsonb_build_object(
+      'fust_key', k.fust_key, 'naam', btrim(k.name),
+      'bewaren', jsonb_build_object('id', k.id, 'mutaties', k.muts, 'voorraad', k.stock),
+      'samenvoegen', (SELECT jsonb_agg(jsonb_build_object('id', q2.id, 'mutaties', q2.muts, 'voorraad', q2.stock)) FROM q q2 WHERE q2.fust_key = k.fust_key AND q2.rn > 1),
+      'na_samenvoegen', jsonb_build_object(
+         'voorraad', (SELECT sum(q3.stock) FROM q q3 WHERE q3.fust_key = k.fust_key),
+         'mutaties', (SELECT sum(q4.muts) FROM q q4 WHERE q4.fust_key = k.fust_key))
+    ) ORDER BY k.name), '[]'::jsonb) INTO v
+    FROM q k WHERE k.rn = 1;
+
+  IF p_uitvoeren THEN
+    FOR v_keep IN SELECT (e->'bewaren'->>'id')::uuid AS keep_id, e->'samenvoegen' AS others FROM jsonb_array_elements(v) e LOOP
+      PERFORM 1 FROM public.fust_types f WHERE f.id = v_keep.keep_id FOR UPDATE;
+      FOR v_oth IN SELECT f.* FROM public.fust_types f
+                WHERE f.id IN (SELECT (x->>'id')::uuid FROM jsonb_array_elements(v_keep.others) x)
+                ORDER BY f.id FOR UPDATE LOOP
+        UPDATE public.fust_stock_mutations SET fust_type_id = v_keep.keep_id WHERE fust_type_id = v_oth.id;
+        GET DIAGNOSTICS v_moved = ROW_COUNT; v_total := v_total + v_moved;
+        UPDATE public.fust_types k SET
+            stock = k.stock + v_oth.stock,
+            minimum_stock = GREATEST(k.minimum_stock, v_oth.minimum_stock),
+            length_mm = COALESCE(k.length_mm, v_oth.length_mm),
+            width_mm  = COALESCE(k.width_mm,  v_oth.width_mm),
+            height_mm = COALESCE(k.height_mm, v_oth.height_mm),
+            notes = COALESCE(k.notes, v_oth.notes)
+          WHERE k.id = v_keep.keep_id;
+        UPDATE public.fust_types SET stock = 0, in_use = false, used_by_count = 0, merged_into = v_keep.keep_id
+          WHERE id = v_oth.id;
+      END LOOP;
+    END LOOP;
+  END IF;
+
+  INSERT INTO public.voorraad_correcties(correctie, uitgevoerd_door, proef, aantallen, hash_ok)
+  VALUES ('voorraad_correctie_1112', COALESCE(auth.uid()::text, session_user::text), NOT p_uitvoeren,
+          jsonb_build_object('fusttypen', jsonb_array_length(v), 'mutaties_overgezet', v_total), true);
+  RETURN jsonb_build_object('ok', true, 'proef', NOT p_uitvoeren, 'fusten', v, 'mutaties_overgezet', v_total);
+END $function$
+;
+REVOKE ALL ON FUNCTION voorraad_correctie_1112(boolean) FROM PUBLIC;
+REVOKE ALL ON FUNCTION voorraad_correctie_1112(boolean) FROM anon;
+GRANT EXECUTE ON FUNCTION voorraad_correctie_1112(boolean) TO service_role;
 CREATE OR REPLACE FUNCTION public.voorraad_correctie_status(p_correctie text DEFAULT '1098'::text)
  RETURNS jsonb
  LANGUAGE plpgsql
@@ -8061,33 +8209,42 @@ CREATE OR REPLACE FUNCTION public.voorraad_fust_dimensions()
  STABLE SECURITY DEFINER
  SET search_path TO 'public'
 AS $function$
--- Leesfunctie voor de Engine: fustcode en maten per fusttype.
--- Maten: eerst Floricode (floricode_packaging_types, eigenaar Floriday-auth), anders handmatig ingevoerd, anders leeg (nooit standaardwaarden).
+-- Leesfunctie voor de Engine. Maten: Floricode → Floriday custom package (floriday_packings_cache) → handmatig → leeg (nooit standaardwaarden).
 DECLARE v_fc boolean := to_regprocedure('public.floricode_packaging_types()') IS NOT NULL;
 BEGIN
   PERFORM public.voorraad_vereis('ingelogd', 'voorraad_fust_dimensions');
-  IF v_fc THEN
-    RETURN QUERY
-    WITH fc AS (SELECT DISTINCT ON (c.code) c.code, c.name, c.length_mm, c.width_mm, c.height_mm
-                  FROM public.floricode_packaging_types() c ORDER BY c.code, c.expiry_date DESC NULLS FIRST)
-    SELECT f.id, f.fust_key, f.vbn_code, f.name, fc.name,
-           COALESCE(fc.length_mm, f.length_mm::numeric), COALESCE(fc.width_mm, f.width_mm::numeric), COALESCE(fc.height_mm, f.height_mm::numeric),
-           CASE WHEN fc.length_mm IS NOT NULL OR fc.width_mm IS NOT NULL OR fc.height_mm IS NOT NULL THEN 'floricode'
-                WHEN f.length_mm IS NOT NULL OR f.width_mm IS NOT NULL OR f.height_mm IS NOT NULL THEN 'handmatig'
-                ELSE 'onbekend' END
-      FROM public.fust_types f
-      LEFT JOIN fc ON f.vbn_code IS NOT NULL AND fc.code = f.vbn_code::text
-     WHERE f.connection_id IS NULL
-     ORDER BY f.name;
-  ELSE
-    RETURN QUERY
-    SELECT f.id, f.fust_key, f.vbn_code, f.name, NULL::text,
-           f.length_mm::numeric, f.width_mm::numeric, f.height_mm::numeric,
-           CASE WHEN f.length_mm IS NOT NULL OR f.width_mm IS NOT NULL OR f.height_mm IS NOT NULL THEN 'handmatig' ELSE 'onbekend' END
-      FROM public.fust_types f
-     WHERE f.connection_id IS NULL
-     ORDER BY f.name;
-  END IF;
+  RETURN QUERY
+  WITH fc AS (
+    SELECT * FROM (SELECT NULL::text code, NULL::text name, NULL::numeric length_mm, NULL::numeric width_mm, NULL::numeric height_mm) z WHERE false
+  ), fcr AS (
+    SELECT x.code, x.name, x.length_mm, x.width_mm, x.height_mm FROM fc x
+  ), cp AS (
+    SELECT DISTINCT ON (p.floriday_id) p.floriday_id,
+      NULLIF(COALESCE(p.data->'dimensions'->>'length', p.data->'dimension'->>'length', p.data->>'lengthMm', p.data->>'length'),'')::numeric AS l,
+      NULLIF(COALESCE(p.data->'dimensions'->>'width',  p.data->'dimension'->>'width',  p.data->>'widthMm',  p.data->>'width'),'')::numeric AS w,
+      NULLIF(COALESCE(p.data->'dimensions'->>'height', p.data->'dimension'->>'height', p.data->>'heightMm', p.data->>'height'),'')::numeric AS h
+    FROM public.floriday_packings_cache p
+    WHERE COALESCE(p.is_deleted,false) = false
+    ORDER BY p.floriday_id, p.updated_at DESC NULLS LAST
+  )
+  SELECT f.id, f.fust_key, f.vbn_code, f.name, d.fc_name,
+         COALESCE(d.fl, cp.l, f.length_mm::numeric),
+         COALESCE(d.fw, cp.w, f.width_mm::numeric),
+         COALESCE(d.fh, cp.h, f.height_mm::numeric),
+         CASE WHEN d.fl IS NOT NULL OR d.fw IS NOT NULL OR d.fh IS NOT NULL THEN 'floricode'
+              WHEN cp.l IS NOT NULL OR cp.w IS NOT NULL OR cp.h IS NOT NULL THEN 'floriday'
+              WHEN f.length_mm IS NOT NULL OR f.width_mm IS NOT NULL OR f.height_mm IS NOT NULL THEN 'handmatig'
+              ELSE 'onbekend' END
+    FROM public.fust_types f
+    LEFT JOIN LATERAL (
+      SELECT c.name AS fc_name, c.length_mm AS fl, c.width_mm AS fw, c.height_mm AS fh
+        FROM public.floricode_packaging_types() c
+       WHERE v_fc AND f.vbn_code IS NOT NULL AND c.code = f.vbn_code::text
+       ORDER BY c.expiry_date DESC NULLS FIRST LIMIT 1
+    ) d ON v_fc
+    LEFT JOIN cp ON f.custom_package_id IS NOT NULL AND cp.floriday_id = f.custom_package_id
+   WHERE f.connection_id IS NULL
+   ORDER BY f.name;
 END $function$
 ;
 REVOKE ALL ON FUNCTION voorraad_fust_dimensions() FROM PUBLIC;
@@ -8211,7 +8368,7 @@ CREATE OR REPLACE FUNCTION public.voorraad_install_check()
  STABLE SECURITY DEFINER
  SET search_path TO 'public'
 AS $function$
-DECLARE v_f text[] := ARRAY['voorraad_reverse_order_mutations','voorraad_withdraw_stock_row','ensure_voorraad_local_context','get_stock_context','voorraad_stock_context_status','voorraad_fcsq_local_guard','_floriday_queue_cleanup_batch','_migrate_rewrite_stock_key','_stock_import_caller','apply_fust_stock_mutation','apply_stock_consumption','apply_stock_reservation','autolink_product_to_floriday','backfill_open_order_reservations','calculate_floriday_desired_stock','calculate_structure_available','canonicalize_trade_item_stock_key','check_product_structure','claim_floriday_base_supply','claim_floriday_stock_queue','cleanup_floriday_stock_queue','cleanup_voorraad_module_history','complete_floriday_base_supply','complete_floriday_stock_queue','complete_floriday_stock_queue_outcome','consume_bom_for_production','consume_order_item','drain_inventory_recompute_queue','enqueue_floriday_continuous_stock','enqueue_floriday_continuous_stock_after_warehouse_preference','enqueue_structure_recompute','ensure_inventory_recompute_drain','ensure_trade_item_stock_row','ensure_trade_item_stock_row_key','fcsq_block_disabled','fcsq_fallback_supersede','fcsq_wake_base_supply','find_trade_item_key','floriday_adopt_connection','floriday_autoheal_connections','floriday_capture_stock_snapshot','floriday_cleanup_stock_queue_v2','floriday_compact_stock_snapshots','floriday_default_owner','floriday_desired_stock_regression_check','floriday_ensure_inventory_settings','floriday_erp_leading_preview','floriday_fill_publish_horizon','floriday_follow_apply','floriday_ingest_sales_orders','floriday_leading_summary','floriday_make_erp_leading','floriday_norm_offer_forms','floriday_orphan_settings_count','floriday_publish_horizon_weeks','floriday_queue_erp_guard','floriday_queue_first_positive','floriday_recompute_inventory','floriday_relink_products','floriday_requeue_dead_letters','floriday_settings_change_recompute','floriday_settings_change_recompute_stmt','floriday_stock_change_recompute','floriday_stock_queue_supersede','floriday_takeover_apply','floriday_takeover_fetch_state','floriday_takeover_store_forms','floriday_takeover_undo','fust_negative_stock_report','fust_types_duplicate_guard','get_active_floriday_context','get_group_allocation_keys','get_group_head_key','get_product_stock','get_product_structure_totals','get_product_structure_totals_batch','inventory_inline_budget_ok','merge_products','normalize_order_source','process_inventory_recompute_queue','produce_designed_product','product_active_group_id','product_id_from_ref','product_is_set','product_label','product_member_group_ids','product_own_available','product_packings_derive','product_packings_replace','product_packings_sync_from_floriday','product_primary_pieces','product_set_depth_above','product_set_depth_below','product_structure_ancestors','product_structure_max_depth','product_structure_path','product_tray_stickers_touch','product_type','promote_trade_item_key','recompute_all_reserved_stock','recompute_order_status','recompute_reserved_for_order','recompute_reserved_stock','requeue_skipped_stock_rows','reset_stalled_floriday_stock_queue','resolve_group_allocation','resolve_group_member_stock_key','resolve_product_id_for_item','resolve_stock_trade_item_key','reverse_production','run_floriday_base_supply_process','run_floriday_continuous_stock_sync','run_floriday_follow','run_floriday_stock_queue_process','run_floriday_stock_reconcile','run_logistics_tasks_dispatch','self_heal_floriday_links','set_module_runtime_config_updated_at','set_product_bom_tenant','set_product_stock','set_updated_at_order_fust_bookings','stock_import_cleanup','stock_import_create','stock_import_process_chunk','stock_import_stop','stock_import_undo_chunk','sync_order_item_fusten','sync_products_quantity_from_stock','touch_fust_types_updated_at','trade_item_drafts_readonly','trade_item_prices_touch_updated_at','trade_item_stock_duplicates','trg_cart_numbers_sync_order_status_fn','trg_cart_session_consume_fn','trg_check_product_structure','trg_floriday_cache_relink_fn','trg_floriday_trade_items_autolink_fn','trg_order_items_autolink_fn','trg_order_items_fusten','trg_order_items_reserve_fn','trg_orders_cancel_release_fn','trg_orders_consume_on_complete_fn','trg_orders_default_phase_fn','trg_orders_external_fulfilled_fn','trg_orders_recompute_reserved_fn','trg_pgi_assign_sort_order','trg_pgi_order_taken_check','trg_process_recompute_on_commit','trg_product_packings_derive_fn','trg_products_autolink_fn','trg_products_floriday_link_enqueue','trg_products_seed_stock_fn','trg_requeue_no_warehouse_cache','trg_requeue_no_warehouse_connection','trg_requeue_no_warehouse_item_pref','trg_requeue_skipped_no_price','trg_stock_structure_recompute_ins','trg_stock_structure_recompute_upd','trg_structure_change_recompute','trg_trade_item_drafts_autolink_fn','trg_trade_item_stock_auto_bom','trg_trade_item_stock_auto_bom_reverse','trg_trade_item_stock_log_change','trg_trade_item_stock_reserve_fn','trg_trade_item_stock_zero_watch','trg_trade_items_cache_autolink_fn','update_updated_at_column','voorraad_alert_floriday_not_updated','voorraad_can_write','voorraad_cleanup_old_rows','voorraad_consume_external_fulfilled','voorraad_correctie_1098','voorraad_correctie_status','voorraad_external_fulfilled_ids','voorraad_floriday_leads_key','voorraad_fust_dimensions','voorraad_hook_base_url','voorraad_hook_on','voorraad_hook_post','voorraad_hook_switch_jobs','voorraad_install_check','voorraad_is_server','voorraad_mark_floriday_sold_before_switch','voorraad_production_enabled','voorraad_schema_ddl','voorraad_touch_updated_at','voorraad_vereis','voorraad_week_is_past'];
+DECLARE v_f text[] := ARRAY['voorraad_article_vbn','voorraad_correctie_1112','voorraad_reverse_order_mutations','voorraad_withdraw_stock_row','ensure_voorraad_local_context','get_stock_context','voorraad_stock_context_status','voorraad_fcsq_local_guard','_floriday_queue_cleanup_batch','_migrate_rewrite_stock_key','_stock_import_caller','apply_fust_stock_mutation','apply_stock_consumption','apply_stock_reservation','autolink_product_to_floriday','backfill_open_order_reservations','calculate_floriday_desired_stock','calculate_structure_available','canonicalize_trade_item_stock_key','check_product_structure','claim_floriday_base_supply','claim_floriday_stock_queue','cleanup_floriday_stock_queue','cleanup_voorraad_module_history','complete_floriday_base_supply','complete_floriday_stock_queue','complete_floriday_stock_queue_outcome','consume_bom_for_production','consume_order_item','drain_inventory_recompute_queue','enqueue_floriday_continuous_stock','enqueue_floriday_continuous_stock_after_warehouse_preference','enqueue_structure_recompute','ensure_inventory_recompute_drain','ensure_trade_item_stock_row','ensure_trade_item_stock_row_key','fcsq_block_disabled','fcsq_fallback_supersede','fcsq_wake_base_supply','find_trade_item_key','floriday_adopt_connection','floriday_autoheal_connections','floriday_capture_stock_snapshot','floriday_cleanup_stock_queue_v2','floriday_compact_stock_snapshots','floriday_default_owner','floriday_desired_stock_regression_check','floriday_ensure_inventory_settings','floriday_erp_leading_preview','floriday_fill_publish_horizon','floriday_follow_apply','floriday_ingest_sales_orders','floriday_leading_summary','floriday_make_erp_leading','floriday_norm_offer_forms','floriday_orphan_settings_count','floriday_publish_horizon_weeks','floriday_queue_erp_guard','floriday_queue_first_positive','floriday_recompute_inventory','floriday_relink_products','floriday_requeue_dead_letters','floriday_settings_change_recompute','floriday_settings_change_recompute_stmt','floriday_stock_change_recompute','floriday_stock_queue_supersede','floriday_takeover_apply','floriday_takeover_fetch_state','floriday_takeover_store_forms','floriday_takeover_undo','fust_negative_stock_report','fust_types_duplicate_guard','get_active_floriday_context','get_group_allocation_keys','get_group_head_key','get_product_stock','get_product_structure_totals','get_product_structure_totals_batch','inventory_inline_budget_ok','merge_products','normalize_order_source','process_inventory_recompute_queue','produce_designed_product','product_active_group_id','product_id_from_ref','product_is_set','product_label','product_member_group_ids','product_own_available','product_packings_derive','product_packings_replace','product_packings_sync_from_floriday','product_primary_pieces','product_set_depth_above','product_set_depth_below','product_structure_ancestors','product_structure_max_depth','product_structure_path','product_tray_stickers_touch','product_type','promote_trade_item_key','recompute_all_reserved_stock','recompute_order_status','recompute_reserved_for_order','recompute_reserved_stock','requeue_skipped_stock_rows','reset_stalled_floriday_stock_queue','resolve_group_allocation','resolve_group_member_stock_key','resolve_product_id_for_item','resolve_stock_trade_item_key','reverse_production','run_floriday_base_supply_process','run_floriday_continuous_stock_sync','run_floriday_follow','run_floriday_stock_queue_process','run_floriday_stock_reconcile','run_logistics_tasks_dispatch','self_heal_floriday_links','set_module_runtime_config_updated_at','set_product_bom_tenant','set_product_stock','set_updated_at_order_fust_bookings','stock_import_cleanup','stock_import_create','stock_import_process_chunk','stock_import_stop','stock_import_undo_chunk','sync_order_item_fusten','sync_products_quantity_from_stock','touch_fust_types_updated_at','trade_item_drafts_readonly','trade_item_prices_touch_updated_at','trade_item_stock_duplicates','trg_cart_numbers_sync_order_status_fn','trg_cart_session_consume_fn','trg_check_product_structure','trg_floriday_cache_relink_fn','trg_floriday_trade_items_autolink_fn','trg_order_items_autolink_fn','trg_order_items_fusten','trg_order_items_reserve_fn','trg_orders_cancel_release_fn','trg_orders_consume_on_complete_fn','trg_orders_default_phase_fn','trg_orders_external_fulfilled_fn','trg_orders_recompute_reserved_fn','trg_pgi_assign_sort_order','trg_pgi_order_taken_check','trg_process_recompute_on_commit','trg_product_packings_derive_fn','trg_products_autolink_fn','trg_products_floriday_link_enqueue','trg_products_seed_stock_fn','trg_requeue_no_warehouse_cache','trg_requeue_no_warehouse_connection','trg_requeue_no_warehouse_item_pref','trg_requeue_skipped_no_price','trg_stock_structure_recompute_ins','trg_stock_structure_recompute_upd','trg_structure_change_recompute','trg_trade_item_drafts_autolink_fn','trg_trade_item_stock_auto_bom','trg_trade_item_stock_auto_bom_reverse','trg_trade_item_stock_log_change','trg_trade_item_stock_reserve_fn','trg_trade_item_stock_zero_watch','trg_trade_items_cache_autolink_fn','update_updated_at_column','voorraad_alert_floriday_not_updated','voorraad_can_write','voorraad_cleanup_old_rows','voorraad_consume_external_fulfilled','voorraad_correctie_1098','voorraad_correctie_status','voorraad_external_fulfilled_ids','voorraad_floriday_leads_key','voorraad_fust_dimensions','voorraad_hook_base_url','voorraad_hook_on','voorraad_hook_post','voorraad_hook_switch_jobs','voorraad_install_check','voorraad_is_server','voorraad_mark_floriday_sold_before_switch','voorraad_production_enabled','voorraad_schema_ddl','voorraad_touch_updated_at','voorraad_vereis','voorraad_week_is_past'];
   v_t text[] := ARRAY['aa0_fcsq_local_context_guard@floriday_continuous_stock_queue','aa_fcsq_erp_leading_guard@floriday_continuous_stock_queue','aa_fis_norm_offer_forms@floriday_inventory_settings','aa_pgi_assign_sort_order@product_group_items','fcsq_block_disabled@floriday_continuous_stock_queue','fcsq_wake_base_supply_ins@floriday_continuous_stock_queue','fcsq_wake_base_supply_upd@floriday_continuous_stock_queue','fust_stock_mutations_apply@fust_stock_mutations','fust_types_duplicate_guard@fust_types','fust_types_touch@fust_types','product_packings_derive_trg@product_packings','product_packings_updated_at@product_packings','set_product_bom_tenant_trigger@product_bom_items','trade_item_prices_set_updated_at@trade_item_prices','trg_cart_numbers_sync_order_status@cart_numbers','trg_cart_session_consume@cart_control_sessions','trg_check_product_structure@product_bom_items','trg_check_product_structure@product_group_items','trg_check_product_structure@product_groups','trg_fcs_queue_updated_at@floriday_continuous_stock_queue','trg_fcsq_fallback_supersede@floriday_continuous_stock_queue','trg_fcsq_supersede@floriday_continuous_stock_queue','trg_floriday_cache_relink@floriday_trade_items_cache','trg_floriday_ensure_inventory_settings@products','trg_floriday_gate_stock_queue@floriday_continuous_stock_queue','trg_floriday_settings_change_recompute_ins@floriday_inventory_settings','trg_floriday_settings_change_recompute_upd@floriday_inventory_settings','trg_floriday_stock_change_recompute@trade_item_stock','trg_floriday_takeover_runs_updated_at@floriday_takeover_runs','trg_floriday_trade_items_autolink@floriday_trade_items_cache','trg_fust_types_requeue_blocked@fust_types','trg_module_runtime_config_updated_at@module_runtime_config','trg_order_fust_bookings_updated_at@order_fust_bookings','trg_order_items_autolink@order_items','trg_order_items_fusten_aiud@order_items','trg_order_items_reserve@order_items','trg_orders_cancel_release@orders','trg_orders_consume_on_complete@orders','trg_orders_default_phase@orders','trg_orders_external_fulfilled@orders','trg_orders_recompute_reserved@orders','trg_prevent_duplicate_product_draft@trade_item_drafts','trg_product_tray_stickers_touch@product_tray_stickers','trg_products_autolink@products','trg_products_floriday_link_enqueue@products','trg_products_seed_stock@products','trg_requeue_no_warehouse_cache@floriday_trade_items_cache','trg_requeue_no_warehouse_connection@floriday_connections','trg_requeue_no_warehouse_item_pref@trade_item_warehouse_preferences','trg_requeue_skipped_no_price@products','trg_stock_mutation_alert@stock_mutation_log','trg_stock_structure_recompute_ins@trade_item_stock','trg_stock_structure_recompute_upd@trade_item_stock','trg_structure_change_recompute@product_bom_items','trg_structure_change_recompute@product_group_items','trg_structure_change_recompute@product_groups','trg_sync_layer_stock_from_trade_stock@trade_item_stock','trg_sync_products_quantity_from_stock_del@trade_item_stock','trg_sync_products_quantity_from_stock_iu@trade_item_stock','trg_trade_item_drafts_autolink@trade_item_drafts','trg_trade_item_drafts_readonly@trade_item_drafts','trg_trade_item_stock_canonical_key@trade_item_stock','trg_trade_item_stock_publish@trade_item_stock','trg_trade_item_stock_reserve@trade_item_stock','trg_trade_item_stock_updated_at@trade_item_stock','trg_trade_item_stock_zero_watch@trade_item_stock','trg_trade_item_supply_lines_touch@trade_item_supply_lines','trg_trade_item_warehouse_preference_enqueue_stock@trade_item_warehouse_preferences','trg_trade_items_cache_autolink@floriday_trade_items_cache','trg_voorraad_buffer_state_updated_at@voorraad_buffer_state','trg_voorraad_event_log_updated_at@voorraad_logistics_event_log','update_trade_item_drafts_updated_at@trade_item_drafts','update_trade_item_warehouse_preferences_updated_at@trade_item_warehouse_preferences','update_voorraad_custom_fields_updated_at@voorraad_custom_fields','update_voorraad_publish_jobs_updated_at@voorraad_publish_jobs','update_voorraad_publish_learnings_updated_at@voorraad_publish_learnings','update_voorraad_publish_steps_updated_at@voorraad_publish_steps','voorraad_hook_switch_jobs@module_runtime_config','zz_fcsq_first_positive@floriday_continuous_stock_queue'];
   v_p text[] := ARRAY['Authenticated can add learnings@voorraad_publish_learnings','Authenticated can delete voorraad custom fields@voorraad_custom_fields','Authenticated can insert vbn required characteristics@floriday_vbn_required_characteristics','Authenticated can insert voorraad custom fields@voorraad_custom_fields','Authenticated can read continuous stock cache@floriday_continuous_stock_cache','Authenticated can read learnings@voorraad_publish_learnings','Authenticated can read vbn required characteristics@floriday_vbn_required_characteristics','Authenticated can read voorraad custom fields@voorraad_custom_fields','Authenticated can update learnings@voorraad_publish_learnings','Authenticated can update vbn required characteristics@floriday_vbn_required_characteristics','Authenticated can update voorraad custom fields@voorraad_custom_fields','Authenticated delete trade_item_warehouse_preferences@trade_item_warehouse_preferences','Authenticated insert trade_item_warehouse_preferences@trade_item_warehouse_preferences','Authenticated select trade_item_warehouse_preferences@trade_item_warehouse_preferences','Authenticated update trade_item_warehouse_preferences@trade_item_warehouse_preferences','Eigen momentopnamen lezen@inventory_stock_snapshots','Eigen voorraadinstellingen beheren@floriday_inventory_settings','Eigenaar leest importporties@stock_import_chunks','Eigenaar leest importregels@stock_import_rows','Fust mutations delete@fust_stock_mutations','Fust mutations insert@fust_stock_mutations','Fust mutations read@fust_stock_mutations','Fust mutations update@fust_stock_mutations','Fust types delete@fust_types','Fust types insert@fust_types','Fust types read@fust_types','Fust types update@fust_types','Ingelogde gebruikers kunnen bufferstatus lezen@voorraad_buffer_state','Ingelogde gebruikers kunnen de eventlog lezen@voorraad_logistics_event_log','Ingelogde gebruikers kunnen fustboekingen lezen@order_fust_bookings','Ingelogde gebruikers lezen drempels@inventory_recompute_limits','Ingelogde gebruikers lezen opruimlogboek@structure_cleanup_log','Ingelogde gebruikers lezen opruimruns@floriday_queue_cleanup_runs','Ingelogden beheren traystickers@product_tray_stickers','Ingelogden lezen herberekenwachtrij@inventory_recompute_queue','Ingelogden lezen voorraadmeldingen@stock_integrity_alerts','Ingelogden markeren voorraadmeldingen als gezien@stock_integrity_alerts','Own queue rows select@floriday_continuous_stock_queue','Owner delete trade_item_drafts@trade_item_drafts','Owner insert trade_item_drafts@trade_item_drafts','Owner select trade_item_drafts@trade_item_drafts','Owner update trade_item_drafts@trade_item_drafts','Signed-in users read reconcile runs@floriday_reconcile_runs','Stock delete@trade_item_stock','Stock insert@trade_item_stock','Stock read@trade_item_stock','Stock update@trade_item_stock','Synchronisatieposities lezen@floriday_sync_cursors','Users can insert own publish attempts@voorraad_publish_attempts','Users can read own publish attempts@voorraad_publish_attempts','Users can read own stock mutations@stock_mutation_log','Users manage own import runs@stock_import_runs','Users manage own supply lines@trade_item_supply_lines','Users manage own trade item prices@trade_item_prices','Users manage their own publish jobs@voorraad_publish_jobs','Users manage their own publish steps@voorraad_publish_steps','Verwerkte orders lezen@floriday_sales_order_ingest','Voorraadschrijvers lezen overnameregels@floriday_takeover_items','Voorraadschrijvers lezen overnames@floriday_takeover_runs','authenticated can insert merge log@product_merge_log','authenticated can read merge log@product_merge_log','service role only@voorraad_media_upload_failures','product_packings_read@product_packings','product_packings_write@product_packings'];
   v_open text[] := ARRAY['voorraad_is_server','voorraad_vereis'];
@@ -8767,6 +8924,7 @@ DO $g$ BEGIN IF to_regclass('public.products') IS NULL THEN RAISE NOTICE 'Voorra
 DO $c$ BEGIN IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'floriday_takeover_items_run_id_fkey' AND conrelid = 'public.floriday_takeover_items'::regclass) THEN ALTER TABLE public.floriday_takeover_items ADD CONSTRAINT floriday_takeover_items_run_id_fkey FOREIGN KEY (run_id) REFERENCES floriday_takeover_runs(id) ON DELETE CASCADE; END IF; END $c$;
 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 = 'fust_types_merged_into_fkey' AND conrelid = 'public.fust_types'::regclass) THEN ALTER TABLE public.fust_types ADD CONSTRAINT fust_types_merged_into_fkey FOREIGN KEY (merged_into) REFERENCES fust_types(id); 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$;
@@ -8810,6 +8968,7 @@ CREATE INDEX IF NOT EXISTS stock_integrity_alerts_open_idx ON public.stock_integ
 CREATE INDEX IF NOT EXISTS trade_item_prices_lookup ON public.trade_item_prices USING btree (trade_item_key, price_group_id);
 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_fust_key_active_uidx ON public.fust_types USING btree (fust_key) WHERE ((connection_id IS NULL) AND (merged_into IS NULL));
 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]));