@flowselections/floriday-voorraad 1.0.92 → 1.0.94

package/dist-lib/server-hooks/floriday-follow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"floriday-follow.d.ts","sourceRoot":"","sources":["../../src/server-hooks/floriday-follow.ts"],"names":[],"mappings":"AA4CA,4DAA4D;AAC5D,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAE9E"}
+{"version":3,"file":"floriday-follow.d.ts","sourceRoot":"","sources":["../../src/server-hooks/floriday-follow.ts"],"names":[],"mappings":"AAwDA,4DAA4D;AAC5D,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAE9E"}

package/dist-lib/server-hooks/floriday-follow.js

@@ -23,10 +23,20 @@ async function handle() {
     const wanted = new Set((follow ?? []).map((r) => String(r.floriday_trade_item_id ?? "").toLowerCase()).filter(Boolean));
     if (wanted.size === 0)
         return json({ idle: true });
+    // Reden van een wachtende ronde zichtbaar op elk Floriday-leidend artikel (alleen eigen kolommen, match op koppeling).
+    const markWaiting = async (reason) => {
+        await admin
+            .from("floriday_inventory_settings")
+            .update({ follow_floriday_at: new Date().toISOString(), follow_floriday_result: reason.slice(0, 300) })
+            .eq("connection_id", conn.id)
+            .eq("erp_leading", false);
+    };
     const { buildTakeoverPreview } = await import("../lib/floriday-takeover-core.js");
     const preview = await buildTakeoverPreview(admin, conn);
-    if (preview.fetchStatus.tradeItems !== "compleet")
+    if (preview.fetchStatus.tradeItems !== "compleet") {
+        await markWaiting("Wacht: artikelen worden nog uit Floriday opgehaald");
         return json({ waiting: true, reason: "Artikelen worden nog opgehaald" });
+    }
     const items = preview.rows
         .filter((r) => r.productId && wanted.has(r.tradeItemId))
         .map((r) => ({

package/package.json

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

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.93 – 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.
@@ -2142,7 +2142,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 +2157,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;
@@ -2987,6 +2994,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 +3274,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;
@@ -4803,6 +4814,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 +4956,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 +5011,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 +5019,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))
@@ -7284,6 +7309,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 +7429,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 +7551,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
@@ -7717,7 +7812,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;