@flowselections/floriday-voorraad 1.0.117 → 1.0.121

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowselections/floriday-voorraad",
-  "version": "1.0.117",
+  "version": "1.0.121",
   "sideEffects": false,
   "type": "module",
   "main": "./dist-lib/index.js",

package/sql/AGENTS.md

@@ -2,3 +2,4 @@
 - Voorraad never creates or replaces functions owned by other modules (Engine `logistics_*`, Floriday-auth, Verkoop; list in `FOREIGN_FUNCS` of `scripts/generate-voorraad-schema.py`); the schema file contains own objects only, because the schema sync would overwrite another module's version.
 - Data corrections only via `voorraad_correctie_<nr>(p_uitvoeren default false)` functions: server-only, match on id, insert/update only (never DELETE), hash-check Floriday cache + queue, log every run in `voorraad_correcties`; `voorraad_correctie_status()` tells other modules whether it ran, because loose SQL per Shell is not repeatable.
 - Fust rows are resolved only via `voorraad_active_fust_id(key, id)` (follows `merged_into`), and an order line books fust once: the ERP line adopts an earlier Floriday-ingest booking and ingest skips lines the ERP already booked, because `fust_key LIMIT 1` hit merged rows and both paths booked the same order.
+- An order line with `order_items.quarantined_at` set counts as cancelled for fust: `sync_order_item_fusten` wants 0 and the update trigger also fires on quarantine on/off, booking the difference against the line's own bookings, because quarantined duplicate orders otherwise kept fust booked.

package/sql/floriday-voorraad-schema.sql

@@ -1,4 +1,4 @@
--- @flowselections/floriday-voorraad 1.0.112 – volledig schema (idempotent, geen gegevens).
+-- @flowselections/floriday-voorraad 1.0.120 – 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.
@@ -3261,10 +3261,8 @@ BEGIN
       v_packages := CEIL(v_pieces::numeric / v_per_package)::int;
     END IF;
 
-    IF v_fust_key IS NOT NULL AND v_packages > 0 THEN
-      SELECT id INTO v_fust_id FROM public.fust_types
-       WHERE fust_key = v_fust_key AND connection_id IS NULL
-       LIMIT 1;
+    IF v_fust_key IS NOT NULL AND v_packages > 0 AND NOT EXISTS (SELECT 1 FROM public.order_fust_bookings b JOIN public.order_items oi ON oi.id = b.order_item_id WHERE oi.source_line_key = r.floriday_id) THEN
+      v_fust_id := public.voorraad_active_fust_id(v_fust_key, NULL);
 
       IF v_fust_id IS NULL THEN
         SELECT user_id INTO v_owner FROM public.fust_types LIMIT 1;
@@ -3289,8 +3287,7 @@ BEGIN
           RETURNING id INTO v_fust_id;
 
           IF v_fust_id IS NULL THEN
-            SELECT id INTO v_fust_id FROM public.fust_types
-             WHERE fust_key = v_fust_key AND connection_id IS NULL LIMIT 1;
+            v_fust_id := public.voorraad_active_fust_id(v_fust_key, NULL);
           END IF;
         END IF;
       END IF;
@@ -4056,9 +4053,9 @@ CREATE OR REPLACE FUNCTION public.fust_negative_stock_report()
  SET search_path TO 'public'
 AS $function$
   SELECT f.id, f.name, f.fust_key, f.stock, -f.stock,
-         (SELECT count(*)::int FROM public.fust_types d WHERE d.fust_key = f.fust_key AND d.id <> f.id)
+         (SELECT count(*)::int FROM public.fust_types d WHERE d.fust_key = f.fust_key AND d.id <> f.id AND d.merged_into IS NULL)
     FROM public.fust_types f
-   WHERE f.stock < 0
+   WHERE f.stock < 0 AND f.merged_into IS NULL
    ORDER BY f.stock;
 $function$
 ;
@@ -6331,96 +6328,93 @@ CREATE OR REPLACE FUNCTION public.sync_order_item_fusten(_order_item_id uuid)
  SET search_path TO 'public'
 AS $function$
 DECLARE
-  v_item record;
-  v_order_number text;
-  v_packs jsonb;
-  v_pack jsonb;
-  v_key text;
-  v_units numeric;
-  v_needed integer;
-  v_fust_id uuid;
-  v_prev integer;
-  v_delta integer;
-  v_wanted jsonb := '{}'::jsonb;
-  v_row record;
-  v_user uuid;
+  v_item record; v_order_number text; v_packs jsonb; v_pack jsonb; v_key text;
+  v_units numeric; v_needed integer; v_fust_id uuid; v_prev integer; v_delta integer;
+  v_wanted jsonb := '{}'::jsonb; v_row record; v_user uuid; v_ing jsonb;
 BEGIN
   PERFORM public.voorraad_vereis('ingelogd', 'sync_order_item_fusten');
-  SELECT oi.*, o.order_number INTO v_item
+  SELECT oi.*, o.order_number, x.quantity_crates, x.packing_source, x.vbn_package_code, x.quarantined_at AS q_at INTO v_item
   FROM logistics_active.order_items oi
   LEFT JOIN public.orders o ON o.id = oi.order_id
+  LEFT JOIN public.order_items x ON x.id = oi.id
   WHERE oi.id = _order_item_id;
 
   v_order_number := COALESCE(v_item.order_number, 'order');
   v_user := COALESCE(auth.uid(), (SELECT user_id FROM public.fust_types WHERE user_id IS NOT NULL LIMIT 1));
 
-  IF v_item.id IS NOT NULL AND v_item.product_id IS NOT NULL AND COALESCE(v_item.quantity,0) > 0 THEN
-    SELECT COALESCE(
-             p.custom_fields->'floriday_payload'->'packingConfigurations',
-             p.custom_fields->'packingConfigurations'
-           )
-      INTO v_packs
-    FROM public.products p WHERE p.id = v_item.product_id;
-
-    IF v_packs IS NULL THEN
-      SELECT c.data->'packingConfigurations' INTO v_packs
-      FROM public.floriday_trade_items_cache c
-      WHERE c.floriday_id = (SELECT p.trade_item_key FROM public.products p WHERE p.id = v_item.product_id)
-      LIMIT 1;
+  IF v_item.id IS NOT NULL AND v_item.q_at IS NULL AND v_item.product_id IS NOT NULL AND COALESCE(v_item.quantity,0) > 0 THEN
+    -- 1. Orderregel zelf: aantal fust, of (Floriday-order) planten per fust + fustcode van de order.
+    IF COALESCE(v_item.quantity_crates, 0) > 0 THEN
+      v_needed := v_item.quantity_crates;
+    ELSIF COALESCE(v_item.plants_per_crate, 0) > 0 THEN
+      v_needed := ceil(v_item.quantity::numeric / v_item.plants_per_crate)::int;
+    END IF;
+    IF COALESCE(v_item.vbn_package_code::text, '') <> '' THEN
+      v_key := 'vbn:' || v_item.vbn_package_code::text;
     END IF;
 
-    IF jsonb_typeof(v_packs) = 'array' THEN
-      SELECT e INTO v_pack FROM jsonb_array_elements(v_packs) e
-      WHERE COALESCE((e->>'isPrimary')::boolean, false) LIMIT 1;
-      IF v_pack IS NULL THEN
-        SELECT e INTO v_pack FROM jsonb_array_elements(v_packs) e LIMIT 1;
+    -- 2. Anders het artikel (wizard-payload, dan Floriday-cache).
+    IF v_needed IS NULL OR v_key IS NULL THEN
+      SELECT COALESCE(p.custom_fields->'floriday_payload'->'packingConfigurations', p.custom_fields->'packingConfigurations')
+        INTO v_packs FROM public.products p WHERE p.id = v_item.product_id;
+      IF v_packs IS NULL THEN
+        SELECT c.data->'packingConfigurations' INTO v_packs
+        FROM public.floriday_trade_items_cache c
+        WHERE c.floriday_id = (SELECT p.trade_item_key FROM public.products p WHERE p.id = v_item.product_id)
+        LIMIT 1;
       END IF;
-
-      IF v_pack IS NOT NULL THEN
-        v_units := NULLIF((v_pack->>'unitsPerPackage')::numeric, 0);
-        IF v_units IS NOT NULL THEN
-          v_needed := ceil(v_item.quantity::numeric / v_units)::int;
-
-          IF COALESCE(v_pack->>'source','') = 'SUPPLIER'
-             AND COALESCE(v_pack->>'packagingMaterialId','') <> '' THEN
-            v_key := 'custom:' || (v_pack->>'packagingMaterialId');
-          ELSIF COALESCE(v_pack->>'packagingType','') <> '' THEN
-            v_key := 'vbn:' || (v_pack->>'packagingType');
-          ELSE
-            v_key := NULL;
+      IF jsonb_typeof(v_packs) = 'array' THEN
+        SELECT e INTO v_pack FROM jsonb_array_elements(v_packs) e WHERE COALESCE((e->>'isPrimary')::boolean, false) LIMIT 1;
+        IF v_pack IS NULL THEN SELECT e INTO v_pack FROM jsonb_array_elements(v_packs) e LIMIT 1; END IF;
+        IF v_pack IS NOT NULL THEN
+          IF v_needed IS NULL THEN
+            v_units := NULLIF((v_pack->>'unitsPerPackage')::numeric, 0);
+            IF v_units IS NOT NULL THEN v_needed := ceil(v_item.quantity::numeric / v_units)::int; END IF;
           END IF;
-
-          IF v_key IS NOT NULL AND v_needed > 0 THEN
-            SELECT id INTO v_fust_id FROM public.fust_types
-            WHERE fust_key = v_key AND connection_id IS NULL LIMIT 1;
-
-            IF v_fust_id IS NULL THEN
-              INSERT INTO public.fust_types (user_id, connection_id, fust_key, name, source, vbn_code, custom_package_id, in_use)
-              VALUES (
-                v_user, NULL, v_key,
-                CASE WHEN v_key LIKE 'vbn:%' THEN 'VBN-fust ' || split_part(v_key, ':', 2)
-                     ELSE 'Eigen fust ' || left(split_part(v_key, ':', 2), 8) END,
-                CASE WHEN v_key LIKE 'vbn:%' THEN 'VBN' ELSE 'SUPPLIER' END,
-                CASE WHEN v_key LIKE 'vbn:%' THEN NULLIF(split_part(v_key, ':', 2), '')::int ELSE NULL END,
-                CASE WHEN v_key LIKE 'custom:%' THEN split_part(v_key, ':', 2) ELSE NULL END,
-                true
-              )
-              ON CONFLICT (fust_key) DO NOTHING;
-              SELECT id INTO v_fust_id FROM public.fust_types WHERE fust_key = v_key LIMIT 1;
-            END IF;
-
-            IF v_fust_id IS NOT NULL THEN
-              v_wanted := v_wanted || jsonb_build_object(v_fust_id::text, v_needed);
+          IF v_key IS NULL THEN
+            IF COALESCE(v_pack->>'source','') = 'SUPPLIER' AND COALESCE(v_pack->>'packagingMaterialId','') <> '' THEN
+              v_key := 'custom:' || (v_pack->>'packagingMaterialId');
+            ELSIF COALESCE(v_pack->>'packagingType','') <> '' THEN
+              v_key := 'vbn:' || (v_pack->>'packagingType');
             END IF;
           END IF;
         END IF;
       END IF;
     END IF;
+
+    IF v_key IS NOT NULL AND COALESCE(v_needed, 0) > 0 THEN
+      v_fust_id := public.voorraad_active_fust_id(v_key, NULL);
+      IF v_fust_id IS NULL THEN
+        INSERT INTO public.fust_types (user_id, connection_id, fust_key, name, source, vbn_code, custom_package_id, in_use)
+        VALUES (v_user, NULL, v_key,
+          CASE WHEN v_key LIKE 'vbn:%' THEN 'VBN-fust ' || split_part(v_key, ':', 2) ELSE 'Eigen fust ' || left(split_part(v_key, ':', 2), 8) END,
+          CASE WHEN v_key LIKE 'vbn:%' THEN 'VBN' ELSE 'SUPPLIER' END,
+          CASE WHEN v_key ~ '^vbn:[0-9]+$' THEN split_part(v_key, ':', 2)::int ELSE NULL END,
+          CASE WHEN v_key LIKE 'custom:%' THEN split_part(v_key, ':', 2) ELSE NULL END,
+          true)
+        ON CONFLICT DO NOTHING;
+        v_fust_id := public.voorraad_active_fust_id(v_key, NULL);
+      END IF;
+      IF v_fust_id IS NOT NULL THEN
+        v_wanted := jsonb_build_object(v_fust_id::text, v_needed);
+      END IF;
+    END IF;
+  END IF;
+
+  -- Floriday-order al afgeboekt bij het binnenhalen: die boeking overnemen (geen tweede mutatie).
+  IF v_item.id IS NOT NULL AND v_item.q_at IS NULL AND v_item.source_line_key IS NOT NULL
+     AND NOT EXISTS (SELECT 1 FROM public.order_fust_bookings b WHERE b.order_item_id = _order_item_id) THEN
+    SELECT i.impact INTO v_ing FROM public.floriday_sales_order_ingest i
+     WHERE i.sales_order_id = v_item.source_line_key AND (i.impact->>'fustTypeId') IS NOT NULL
+     ORDER BY i.order_version DESC LIMIT 1;
+    IF v_ing IS NOT NULL AND COALESCE((v_ing->>'fustPackages')::int, 0) > 0 THEN
+      INSERT INTO public.order_fust_bookings (order_item_id, fust_type_id, quantity)
+      VALUES (_order_item_id, public.voorraad_active_fust_id(NULL, (v_ing->>'fustTypeId')::uuid), (v_ing->>'fustPackages')::int)
+      ON CONFLICT (order_item_id, fust_type_id) DO NOTHING;
+    END IF;
   END IF;
 
-  FOR v_row IN
-    SELECT b.fust_type_id, b.quantity FROM public.order_fust_bookings b
-    WHERE b.order_item_id = _order_item_id
+  FOR v_row IN SELECT b.fust_type_id, b.quantity FROM public.order_fust_bookings b WHERE b.order_item_id = _order_item_id
   LOOP
     v_prev := v_row.quantity;
     v_needed := COALESCE((v_wanted->>v_row.fust_type_id::text)::int, 0);
@@ -6428,15 +6422,13 @@ BEGIN
     IF v_delta <> 0 THEN
       INSERT INTO public.fust_stock_mutations (user_id, fust_type_id, delta, reason, note)
       VALUES (COALESCE(v_user, (SELECT user_id FROM public.fust_types WHERE id = v_row.fust_type_id)),
-              v_row.fust_type_id, v_delta,
-              CASE WHEN v_delta > 0 THEN 'sale_cancelled' ELSE 'sale' END,
-              'Order ' || v_order_number);
+              public.voorraad_active_fust_id(NULL, v_row.fust_type_id), v_delta,
+              CASE WHEN v_delta > 0 THEN 'sale_cancelled' ELSE 'sale' END, 'Order ' || v_order_number);
     END IF;
     IF v_needed = 0 THEN
       DELETE FROM public.order_fust_bookings WHERE order_item_id = _order_item_id AND fust_type_id = v_row.fust_type_id;
     ELSE
-      UPDATE public.order_fust_bookings SET quantity = v_needed
-      WHERE order_item_id = _order_item_id AND fust_type_id = v_row.fust_type_id;
+      UPDATE public.order_fust_bookings SET quantity = v_needed WHERE order_item_id = _order_item_id AND fust_type_id = v_row.fust_type_id;
     END IF;
     v_wanted := v_wanted - v_row.fust_type_id::text;
   END LOOP;
@@ -6446,7 +6438,6 @@ BEGIN
     INSERT INTO public.order_fust_bookings (order_item_id, fust_type_id, quantity)
     VALUES (_order_item_id, v_row.fust_type_id::uuid, v_row.qty)
     ON CONFLICT (order_item_id, fust_type_id) DO UPDATE SET quantity = EXCLUDED.quantity;
-
     INSERT INTO public.fust_stock_mutations (user_id, fust_type_id, delta, reason, note)
     VALUES (COALESCE(v_user, (SELECT user_id FROM public.fust_types WHERE id = v_row.fust_type_id::uuid)),
             v_row.fust_type_id::uuid, -v_row.qty, 'sale', 'Order ' || v_order_number);
@@ -7715,6 +7706,36 @@ REVOKE ALL ON FUNCTION update_updated_at_column() FROM anon;
 REVOKE EXECUTE ON FUNCTION update_updated_at_column() FROM 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_active_fust_id(p_fust_key text, p_fust_id uuid)
+ RETURNS uuid
+ LANGUAGE plpgsql
+ STABLE SECURITY DEFINER
+ SET search_path TO 'public'
+AS $function$
+-- Actieve fustrij: volg merged_into vanaf een opgeslagen id, anders op fust_key (geen koppeling, niet samengevoegd).
+DECLARE v uuid; v_next uuid; i int := 0;
+BEGIN
+  PERFORM public.voorraad_vereis('ingelogd', 'voorraad_active_fust_id');
+  IF p_fust_id IS NOT NULL THEN
+    v := p_fust_id;
+    LOOP
+      SELECT merged_into INTO v_next FROM public.fust_types WHERE id = v;
+      EXIT WHEN v_next IS NULL OR i > 10;
+      v := v_next; i := i + 1;
+    END LOOP;
+    RETURN v;
+  END IF;
+  IF p_fust_key IS NULL THEN RETURN NULL; END IF;
+  SELECT id INTO v FROM public.fust_types
+   WHERE fust_key = p_fust_key AND connection_id IS NULL AND merged_into IS NULL
+   ORDER BY created_at, id LIMIT 1;
+  RETURN v;
+END $function$
+;
+REVOKE ALL ON FUNCTION voorraad_active_fust_id(text,uuid) FROM PUBLIC;
+REVOKE ALL ON FUNCTION voorraad_active_fust_id(text,uuid) FROM anon;
+GRANT EXECUTE ON FUNCTION voorraad_active_fust_id(text,uuid) TO authenticated;
+GRANT EXECUTE ON FUNCTION voorraad_active_fust_id(text,uuid) 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
@@ -8125,6 +8146,229 @@ 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_1114(p_uitvoeren boolean DEFAULT false)
+ RETURNS jsonb
+ LANGUAGE plpgsql
+ SECURITY DEFINER
+ SET search_path TO 'public'
+AS $function$
+DECLARE v_mut jsonb; v_ref jsonb; v_dup jsonb; r record; v_target uuid; v_from uuid;
+  n_mut int := 0; n_dup int := 0; n_ref int := 0; v_skip jsonb := '[]'::jsonb; v_c int;
+BEGIN
+  PERFORM public.voorraad_vereis('server', 'voorraad_correctie_1114');
+  SELECT COALESCE(jsonb_agg(jsonb_build_object('mutatie_id', m.id, 'tijd', m.created_at, 'delta', m.delta, 'notitie', m.note,
+           'van', m.fust_type_id, 'naar', public.voorraad_active_fust_id(NULL, m.fust_type_id)) ORDER BY m.created_at), '[]')
+    INTO v_mut FROM public.fust_stock_mutations m JOIN public.fust_types f ON f.id = m.fust_type_id WHERE f.merged_into IS NOT NULL;
+  -- Dubbel: binnenhaal-boeking bestaat als mutatie EN de ERP-orderregel boekte opnieuw.
+  SELECT COALESCE(jsonb_agg(jsonb_build_object('order', o.order_number, 'order_item_id', oi.id,
+           'erp_fust', b.quantity, 'juist_fust', (i.impact->>'fustPackages')::int)), '[]')
+    INTO v_dup
+    FROM public.order_items oi JOIN public.orders o ON o.id = oi.order_id
+    JOIN public.order_fust_bookings b ON b.order_item_id = oi.id
+    JOIN LATERAL (SELECT x.impact FROM public.floriday_sales_order_ingest x WHERE x.sales_order_id = oi.source_line_key
+                    AND COALESCE((x.impact->>'fustPackages')::int,0) > 0 ORDER BY x.order_version DESC LIMIT 1) i ON true
+    WHERE EXISTS (SELECT 1 FROM public.fust_stock_mutations m WHERE m.note LIKE 'Floriday-order ' || oi.source_line_key || '%')
+      AND NOT EXISTS (SELECT 1 FROM public.fust_stock_mutations m WHERE m.note = '[1114] tegenboeking dubbel ' || oi.id::text);
+  SELECT jsonb_build_object(
+    'products', (SELECT count(*) FROM public.products p JOIN public.fust_types f ON f.id = p.fust_type_id WHERE f.merged_into IS NOT NULL),
+    'product_packings', (SELECT count(*) FROM public.product_packings p JOIN public.fust_types f ON f.id = p.fust_type_id WHERE f.merged_into IS NOT NULL),
+    'order_fust_bookings', (SELECT count(*) FROM public.order_fust_bookings p JOIN public.fust_types f ON f.id = p.fust_type_id WHERE f.merged_into IS NOT NULL),
+    'logistics_product_dimensions', (SELECT count(*) FROM public.logistics_product_dimensions p JOIN public.fust_types f ON f.id = p.fust_type_id WHERE f.merged_into IS NOT NULL)
+  ) INTO v_ref;
+
+  IF NOT p_uitvoeren THEN
+    INSERT INTO public.voorraad_correcties(correctie, uitgevoerd_door, proef, aantallen, hash_ok)
+    VALUES ('voorraad_correctie_1114', COALESCE(auth.uid()::text, session_user::text), true,
+            jsonb_build_object('mutaties_verplaatsen', jsonb_array_length(v_mut), 'dubbele_orders', jsonb_array_length(v_dup)) || v_ref, true);
+    RETURN jsonb_build_object('ok', true, 'proef', true, 'mutaties_verplaatsen', v_mut, 'dubbele_orderboekingen', v_dup, 'verwijzingen_samengevoegd', v_ref);
+  END IF;
+
+  -- a. mutaties op samengevoegde rijen naar de actieve rij (op id)
+  FOR r IN SELECT m.id, m.delta, m.fust_type_id AS van, public.voorraad_active_fust_id(NULL, m.fust_type_id) AS naar
+           FROM public.fust_stock_mutations m JOIN public.fust_types f ON f.id = m.fust_type_id
+           WHERE f.merged_into IS NOT NULL ORDER BY m.id FOR UPDATE OF m
+  LOOP
+    IF r.naar IS NULL OR r.naar = r.van THEN
+      v_skip := v_skip || jsonb_build_object('mutatie_id', r.id, 'reden', 'geen actieve rij'); CONTINUE;
+    END IF;
+    UPDATE public.fust_stock_mutations SET fust_type_id = r.naar WHERE id = r.id AND fust_type_id = r.van;
+    GET DIAGNOSTICS v_c = ROW_COUNT;
+    IF v_c = 1 THEN
+      UPDATE public.fust_types SET stock = stock - r.delta, updated_at = now() WHERE id = r.van;
+      UPDATE public.fust_types SET stock = stock + r.delta, updated_at = now() WHERE id = r.naar;
+      n_mut := n_mut + 1;
+    END IF;
+  END LOOP;
+
+  -- b. dubbele orderboekingen: binnenhaal-boeking blijft, ERP-boeking krijgt tegenboeking
+  FOR r IN SELECT oi.id AS item, o.order_number, b.fust_type_id AS bf, b.quantity AS bq,
+                  (i.impact->>'fustPackages')::int AS ip, NULLIF(i.impact->>'fustTypeId','')::uuid AS ifid,
+                  (SELECT COALESCE(sum(m.delta),0) FROM public.fust_stock_mutations m WHERE m.note LIKE 'Floriday-order ' || oi.source_line_key || '%') AS ing_sum
+           FROM public.order_items oi JOIN public.orders o ON o.id = oi.order_id
+           JOIN public.order_fust_bookings b ON b.order_item_id = oi.id
+           JOIN LATERAL (SELECT x.impact FROM public.floriday_sales_order_ingest x WHERE x.sales_order_id = oi.source_line_key
+                           AND COALESCE((x.impact->>'fustPackages')::int,0) > 0 ORDER BY x.order_version DESC LIMIT 1) i ON true
+           WHERE EXISTS (SELECT 1 FROM public.fust_stock_mutations m WHERE m.note LIKE 'Floriday-order ' || oi.source_line_key || '%')
+           ORDER BY oi.id
+  LOOP
+    IF EXISTS (SELECT 1 FROM public.fust_stock_mutations m WHERE m.note = '[1114] tegenboeking dubbel ' || r.item::text) THEN
+      v_skip := v_skip || jsonb_build_object('order', r.order_number, 'order_item_id', r.item, 'reden', 'al gecorrigeerd'); CONTINUE;
+    END IF;
+    IF r.ing_sum <> -r.ip THEN
+      v_skip := v_skip || jsonb_build_object('order', r.order_number, 'order_item_id', r.item, 'reden', 'binnenhaal-boeking wijkt af', 'mutaties', r.ing_sum, 'verwacht', -r.ip); CONTINUE;
+    END IF;
+    v_target := public.voorraad_active_fust_id(NULL, COALESCE(r.ifid, r.bf));
+    v_from := public.voorraad_active_fust_id(NULL, r.bf);
+    IF v_target IS NULL OR v_from IS NULL THEN
+      v_skip := v_skip || jsonb_build_object('order', r.order_number, 'order_item_id', r.item, 'reden', 'fust onbekend'); CONTINUE;
+    END IF;
+    IF v_target <> r.bf AND EXISTS (SELECT 1 FROM public.order_fust_bookings x WHERE x.order_item_id = r.item AND x.fust_type_id = v_target) THEN
+      v_skip := v_skip || jsonb_build_object('order', r.order_number, 'order_item_id', r.item, 'reden', 'tweede boeking op ander fust'); CONTINUE;
+    END IF;
+    PERFORM 1 FROM public.order_fust_bookings WHERE order_item_id = r.item AND fust_type_id = r.bf FOR UPDATE;
+    INSERT INTO public.fust_stock_mutations (user_id, fust_type_id, delta, reason, note)
+    VALUES ((SELECT user_id FROM public.fust_types WHERE id = v_from), v_from, r.bq, 'sale_cancelled',
+            '[1114] tegenboeking dubbel ' || r.item::text);
+    UPDATE public.order_fust_bookings SET fust_type_id = v_target, quantity = r.ip
+     WHERE order_item_id = r.item AND fust_type_id = r.bf;
+    n_dup := n_dup + 1;
+  END LOOP;
+
+  -- c. verwijzingen naar samengevoegde rijen
+  UPDATE public.products p SET fust_type_id = public.voorraad_active_fust_id(NULL, p.fust_type_id)
+    FROM public.fust_types f WHERE f.id = p.fust_type_id AND f.merged_into IS NOT NULL;
+  GET DIAGNOSTICS v_c = ROW_COUNT; n_ref := n_ref + v_c;
+  UPDATE public.product_packings p SET fust_type_id = public.voorraad_active_fust_id(NULL, p.fust_type_id)
+    FROM public.fust_types f WHERE f.id = p.fust_type_id AND f.merged_into IS NOT NULL;
+  GET DIAGNOSTICS v_c = ROW_COUNT; n_ref := n_ref + v_c;
+  UPDATE public.order_fust_bookings p SET fust_type_id = public.voorraad_active_fust_id(NULL, p.fust_type_id)
+    FROM public.fust_types f WHERE f.id = p.fust_type_id AND f.merged_into IS NOT NULL
+     AND NOT EXISTS (SELECT 1 FROM public.order_fust_bookings x WHERE x.order_item_id = p.order_item_id
+                     AND x.fust_type_id = public.voorraad_active_fust_id(NULL, p.fust_type_id));
+  GET DIAGNOSTICS v_c = ROW_COUNT; n_ref := n_ref + v_c;
+
+  INSERT INTO public.voorraad_correcties(correctie, uitgevoerd_door, proef, aantallen, hash_ok)
+  VALUES ('voorraad_correctie_1114', COALESCE(auth.uid()::text, session_user::text), false,
+          jsonb_build_object('mutaties_verplaatst', n_mut, 'tegenboekingen', n_dup, 'verwijzingen', n_ref, 'overgeslagen', v_skip), true);
+  RETURN jsonb_build_object('ok', true, 'proef', false, 'mutaties_verplaatst', n_mut, 'tegenboekingen', n_dup,
+                            'verwijzingen_omgezet', n_ref, 'overgeslagen', v_skip);
+END;
+$function$
+;
+REVOKE ALL ON FUNCTION voorraad_correctie_1114(boolean) FROM PUBLIC;
+REVOKE ALL ON FUNCTION voorraad_correctie_1114(boolean) FROM anon;
+GRANT EXECUTE ON FUNCTION voorraad_correctie_1114(boolean) TO authenticated;
+GRANT EXECUTE ON FUNCTION voorraad_correctie_1114(boolean) TO service_role;
+CREATE OR REPLACE FUNCTION public.voorraad_correctie_1119(p_uitvoeren boolean DEFAULT false)
+ RETURNS jsonb
+ LANGUAGE plpgsql
+ SECURITY DEFINER
+ SET search_path TO 'public'
+AS $function$
+DECLARE v_item constant uuid := 'c976982c-1831-4021-b0f5-4e03c7ce8e14'; v_b record; v_need int; v_q int; v_ppc int; v_order text;
+BEGIN
+  PERFORM public.voorraad_vereis('server', 'voorraad_correctie_1119');
+  IF EXISTS (SELECT 1 FROM public.fust_stock_mutations WHERE note = '[1119] tegenboeking ' || v_item::text) THEN
+    RETURN jsonb_build_object('ok', true, 'al_uitgevoerd', true);
+  END IF;
+  SELECT oi.quantity, oi.plants_per_crate, o.order_number INTO v_q, v_ppc, v_order
+    FROM public.order_items oi JOIN public.orders o ON o.id = oi.order_id WHERE oi.id = v_item;
+  SELECT * INTO v_b FROM public.order_fust_bookings WHERE order_item_id = v_item FOR UPDATE;
+  IF v_b IS NULL OR COALESCE(v_ppc,0) = 0 THEN RETURN jsonb_build_object('ok', false, 'reden', 'regel of boeking niet gevonden'); END IF;
+  v_need := ceil(v_q::numeric / v_ppc)::int;
+  IF NOT p_uitvoeren OR v_b.quantity <> 46 OR v_need <> 23 THEN
+    RETURN jsonb_build_object('ok', v_b.quantity = 46 AND v_need = 23, 'proef', true, 'order', v_order, 'regel', v_item,
+      'geboekt', v_b.quantity, 'juist', v_need, 'tegenboeking', v_b.quantity - v_need);
+  END IF;
+  INSERT INTO public.fust_stock_mutations (user_id, fust_type_id, delta, reason, note)
+  VALUES ((SELECT user_id FROM public.fust_types WHERE id = v_b.fust_type_id), public.voorraad_active_fust_id(NULL, v_b.fust_type_id),
+          v_b.quantity - v_need, 'sale_cancelled', '[1119] tegenboeking ' || v_item::text);
+  UPDATE public.order_fust_bookings SET quantity = v_need WHERE order_item_id = v_item AND fust_type_id = v_b.fust_type_id;
+  INSERT INTO public.voorraad_correcties(correctie, uitgevoerd_door, proef, aantallen, hash_ok)
+  VALUES ('voorraad_correctie_1119', COALESCE(auth.uid()::text, session_user::text), false,
+          jsonb_build_object('order', v_order, 'regel', v_item, 'van', v_b.quantity, 'naar', v_need), true);
+  RETURN jsonb_build_object('ok', true, 'proef', false, 'order', v_order, 'van', v_b.quantity, 'naar', v_need, 'tegenboeking', v_b.quantity - v_need);
+END;
+$function$
+;
+REVOKE ALL ON FUNCTION voorraad_correctie_1119(boolean) FROM PUBLIC;
+REVOKE ALL ON FUNCTION voorraad_correctie_1119(boolean) FROM anon;
+GRANT EXECUTE ON FUNCTION voorraad_correctie_1119(boolean) TO service_role;
+CREATE OR REPLACE FUNCTION public.voorraad_correctie_1120(p_uitvoeren boolean DEFAULT false)
+ RETURNS jsonb
+ LANGUAGE plpgsql
+ SECURITY DEFINER
+ SET search_path TO 'public'
+AS $function$
+DECLARE
+  v_plan constant jsonb := '[
+    {"id":"b946f153-4d53-4be1-8a07-41d755a6b62e","verwacht":3,"juist":1,"reden":"HO-2601367: orderregel 14 per fust"},
+    {"id":"5aea4066-a80f-417d-beeb-e5932449e619","verwacht":40,"juist":80,"reden":"FO-2601351: Floriday 6 per fust"},
+    {"id":"bb1dd37a-f559-4e5e-93f1-c86b511d7ef9","verwacht":40,"juist":80,"reden":"FO-2601354: Floriday 6 per fust"},
+    {"id":"adc0f90f-c3e9-49e9-8d7c-106418e36ee5","verwacht":20,"juist":40,"reden":"FO-2601360: Floriday 6 per fust"},
+    {"id":"1dd25df8-26bb-4b47-a4c5-4d17a44ee0c0","verwacht":20,"juist":40,"reden":"FO-2601364: Floriday 6 per fust"},
+    {"id":"565eb0b4-c279-4b83-8829-3409754c2799","verwacht":8,"juist":0,"reden":"FO-2601327: dubbele regel zonder koppeling"},
+    {"id":"bae3ccd8-7d9d-4f85-9d64-630cca7fa991","verwacht":7,"juist":0,"reden":"FO-2601327: dubbele regel zonder koppeling"},
+    {"id":"1f9afe19-c23b-4bc6-945b-51bec8647b51","verwacht":6,"juist":0,"reden":"FO-2601331: dubbele regel zonder koppeling"},
+    {"id":"5bf4d2cc-a9c4-4f39-ae24-5cdc25bf627d","verwacht":16,"juist":0,"reden":"FO-2601331: dubbele regel zonder koppeling"},
+    {"id":"0a4a6857-be44-4776-ada2-8554a7fbd892","verwacht":10,"juist":0,"reden":"FO-2601336: dubbele regel zonder koppeling"},
+    {"id":"361d39b1-0a2f-4c6b-abdf-927e9b93325e","verwacht":9,"juist":0,"reden":"FO-2601340: dubbele regel zonder koppeling"},
+    {"id":"f429a4db-37ce-4e6a-ae9a-f0947a00fd08","verwacht":18,"juist":0,"reden":"FO-2601340: dubbele regel zonder koppeling"},
+    {"id":"4499a830-4d0a-42c7-90d7-8ffedf0d4e98","verwacht":8,"juist":0,"reden":"FO-2601329: dubbele order, quarantaine","quarantaine":true}
+  ]'::jsonb;
+  v_p jsonb; v_b record; v_id uuid; v_order text; v_q timestamptz; v_fust uuid;
+  v_regels jsonb := '[]'::jsonb; v_status text; v_delta int;
+  v_voor jsonb := '{}'::jsonb; v_na jsonb := '{}'::jsonb; v_n int := 0;
+BEGIN
+  PERFORM public.voorraad_vereis('server', 'voorraad_correctie_1120');
+  FOR v_p IN SELECT * FROM jsonb_array_elements(v_plan) LOOP
+    v_id := (v_p->>'id')::uuid; v_b := NULL; v_order := NULL; v_q := NULL;
+    SELECT o.order_number, oi.quarantined_at INTO v_order, v_q
+      FROM public.order_items oi JOIN public.orders o ON o.id = oi.order_id WHERE oi.id = v_id;
+    IF v_order IS NOT NULL THEN
+      PERFORM pg_advisory_xact_lock(hashtext('voorraad_fust_order:' || v_order));
+    END IF;
+    SELECT * INTO v_b FROM public.order_fust_bookings WHERE order_item_id = v_id ORDER BY id LIMIT 1 FOR UPDATE;
+    v_fust := CASE WHEN v_b.fust_type_id IS NULL THEN NULL ELSE public.voorraad_active_fust_id(NULL, v_b.fust_type_id) END;
+    IF v_order IS NULL THEN v_status := 'overgeslagen: orderregel niet in deze database';
+    ELSIF EXISTS (SELECT 1 FROM public.fust_stock_mutations WHERE note = '[1120] ' || v_id::text) THEN v_status := 'al uitgevoerd';
+    ELSIF COALESCE(v_b.quantity, 0) = (v_p->>'juist')::int THEN v_status := 'al juist (geen boeking)';
+    ELSIF v_b.quantity IS DISTINCT FROM (v_p->>'verwacht')::int THEN v_status := 'overgeslagen: geboekt ' || COALESCE(v_b.quantity::text,'geen') || ', verwacht ' || (v_p->>'verwacht');
+    ELSIF COALESCE((v_p->>'quarantaine')::boolean, false) AND v_q IS NULL THEN v_status := 'overgeslagen: wacht op quarantaine door Verkoop';
+    ELSE v_status := CASE WHEN p_uitvoeren THEN 'uitgevoerd' ELSE 'voorstel' END;
+    END IF;
+    v_delta := COALESCE(v_b.quantity, 0) - (v_p->>'juist')::int;
+    IF v_fust IS NOT NULL AND NOT v_voor ? v_fust::text THEN
+      v_voor := v_voor || jsonb_build_object(v_fust::text, (SELECT jsonb_build_object('naam', name, 'voorraad', stock) FROM public.fust_types WHERE id = v_fust));
+    END IF;
+    IF v_status = 'uitgevoerd' THEN
+      PERFORM 1 FROM public.fust_types WHERE id = v_fust FOR UPDATE;
+      INSERT INTO public.fust_stock_mutations (user_id, fust_type_id, delta, reason, note)
+      VALUES ((SELECT user_id FROM public.fust_types WHERE id = v_fust), v_fust, v_delta,
+              CASE WHEN v_delta > 0 THEN 'sale_cancelled' ELSE 'sale' END, '[1120] ' || v_id::text);
+      UPDATE public.order_fust_bookings SET quantity = (v_p->>'juist')::int
+       WHERE order_item_id = v_id AND fust_type_id = v_b.fust_type_id;
+      v_n := v_n + 1;
+    END IF;
+    v_regels := v_regels || jsonb_build_object('order', v_order, 'regel', v_id, 'reden', v_p->>'reden',
+      'geboekt', v_b.quantity, 'juist', (v_p->>'juist')::int,
+      'tegenboeking', CASE WHEN v_status IN ('voorstel','uitgevoerd') THEN v_delta ELSE 0 END, 'status', v_status);
+  END LOOP;
+  SELECT COALESCE(jsonb_object_agg(id::text, jsonb_build_object('naam', name, 'voorraad', stock)), '{}'::jsonb) INTO v_na
+    FROM public.fust_types WHERE v_voor ? id::text;
+  IF p_uitvoeren THEN
+    INSERT INTO public.voorraad_correcties(correctie, uitgevoerd_door, proef, aantallen, hash_ok)
+    VALUES ('voorraad_correctie_1120', COALESCE(auth.uid()::text, session_user::text), false,
+            jsonb_build_object('geboekt', v_n, 'regels', v_regels, 'voor', v_voor, 'na', v_na), true);
+  END IF;
+  RETURN jsonb_build_object('ok', true, 'proef', NOT p_uitvoeren, 'geboekt', v_n,
+    'regels', v_regels, 'fust_voor', v_voor, 'fust_na', v_na);
+END;
+$function$
+;
+REVOKE ALL ON FUNCTION voorraad_correctie_1120(boolean) FROM PUBLIC;
+REVOKE ALL ON FUNCTION voorraad_correctie_1120(boolean) FROM anon;
+GRANT EXECUTE ON FUNCTION voorraad_correctie_1120(boolean) TO service_role;
 CREATE OR REPLACE FUNCTION public.voorraad_correctie_status(p_correctie text DEFAULT '1098'::text)
  RETURNS jsonb
  LANGUAGE plpgsql
@@ -9322,7 +9566,8 @@ DO $g$ BEGIN IF to_regclass('public.module_runtime_config') IS NULL THEN RAISE N
 DROP TRIGGER IF EXISTS trg_order_fust_bookings_updated_at ON public.order_fust_bookings;
 CREATE TRIGGER trg_order_fust_bookings_updated_at BEFORE UPDATE ON public.order_fust_bookings FOR EACH ROW EXECUTE FUNCTION set_updated_at_order_fust_bookings();
 DO $g$ BEGIN IF to_regclass('public.order_items') IS NULL THEN RAISE NOTICE 'Voorraad: order_items (Verkoop) ontbreekt, triggers overgeslagen; draai de schema-update opnieuw na die module'; ELSE EXECUTE $q$CREATE TRIGGER trg_order_items_autolink BEFORE INSERT ON public.order_items FOR EACH ROW EXECUTE FUNCTION trg_order_items_autolink_fn()$q$; END IF; END $g$;
-DO $g$ BEGIN IF to_regclass('public.order_items') IS NULL THEN RAISE NOTICE 'Voorraad: order_items (Verkoop) ontbreekt, triggers overgeslagen; draai de schema-update opnieuw na die module'; ELSE EXECUTE $q$CREATE TRIGGER trg_order_items_fusten_aiud AFTER INSERT OR DELETE OR UPDATE OF quantity, product_id ON public.order_items FOR EACH ROW EXECUTE FUNCTION trg_order_items_fusten()$q$; END IF; END $g$;
+DO $g$ BEGIN IF to_regclass('public.order_items') IS NULL THEN RAISE NOTICE 'Voorraad: order_items (Verkoop) ontbreekt, triggers overgeslagen; draai de schema-update opnieuw na die module'; ELSE EXECUTE $q$CREATE TRIGGER trg_order_items_fusten_aid AFTER INSERT OR DELETE ON public.order_items FOR EACH ROW EXECUTE FUNCTION trg_order_items_fusten()$q$; END IF; END $g$;
+DO $g$ BEGIN IF to_regclass('public.order_items') IS NULL THEN RAISE NOTICE 'Voorraad: order_items (Verkoop) ontbreekt, triggers overgeslagen; draai de schema-update opnieuw na die module'; ELSE EXECUTE $q$CREATE TRIGGER trg_order_items_fusten_au AFTER UPDATE OF quantity, product_id, plants_per_crate, quantity_crates, vbn_package_code, packing_source, quarantined_at ON public.order_items FOR EACH ROW WHEN (((old.quantity IS DISTINCT FROM new.quantity) OR (old.product_id IS DISTINCT FROM new.product_id) OR (old.plants_per_crate IS DISTINCT FROM new.plants_per_crate) OR (old.quantity_crates IS DISTINCT FROM new.quantity_crates) OR (old.vbn_package_code IS DISTINCT FROM new.vbn_package_code) OR (old.packing_source IS DISTINCT FROM new.packing_source) OR ((old.quarantined_at IS NULL) IS DISTINCT FROM (new.quarantined_at IS NULL)))) EXECUTE FUNCTION trg_order_items_fusten()$q$; END IF; END $g$;
 DO $g$ BEGIN IF to_regclass('public.order_items') IS NULL THEN RAISE NOTICE 'Voorraad: order_items (Verkoop) ontbreekt, triggers overgeslagen; draai de schema-update opnieuw na die module'; ELSE EXECUTE $q$CREATE TRIGGER trg_order_items_reserve AFTER INSERT OR DELETE OR UPDATE OF quantity, product_id, order_id, quarantined_at, source_line_key ON public.order_items FOR EACH ROW EXECUTE FUNCTION trg_order_items_reserve_fn()$q$; END IF; END $g$;
 DO $g$ BEGIN IF to_regclass('public.orders') IS NULL THEN RAISE NOTICE 'Voorraad: orders (Verkoop) ontbreekt, triggers overgeslagen; draai de schema-update opnieuw na die module'; ELSE EXECUTE $q$CREATE TRIGGER trg_orders_cancel_release AFTER UPDATE OF status ON public.orders FOR EACH ROW EXECUTE FUNCTION trg_orders_cancel_release_fn()$q$; END IF; END $g$;
 DO $g$ BEGIN IF to_regclass('public.orders') IS NULL THEN RAISE NOTICE 'Voorraad: orders (Verkoop) ontbreekt, triggers overgeslagen; draai de schema-update opnieuw na die module'; ELSE EXECUTE $q$CREATE TRIGGER trg_orders_consume_on_complete AFTER UPDATE OF status ON public.orders FOR EACH ROW EXECUTE FUNCTION trg_orders_consume_on_complete_fn()$q$; END IF; END $g$;