diff --git a/api/cost_modules_test.ts b/api/cost_modules_test.ts index 735b684..ce4a2b9 100644 --- a/api/cost_modules_test.ts +++ b/api/cost_modules_test.ts @@ -202,6 +202,59 @@ Deno.test("RPC almacén: central, obra, entrada, transferencia, salida", async ( global: true, }); assertEquals(globalStock.ok, true); + const consolidated = (globalStock.data as { consolidated: Array<{ material_id: number; qty_on_hand: number }> }).consolidated; + const cem = consolidated.find((row) => Number(row.material_id) === materialId); + assertExists(cem); + assertEquals(Number(cem.qty_on_hand), 45); + + await db.prepare( + `INSERT INTO projects (code, name, status, theme_id, company_id, tenant_id) + VALUES ('COST-0002', 'Obra sin almacén', 'activo', 'arctec-dos-logos-fold', ?, ?)`, + ).run(fx.companyId, TENANT_ID); + const listedAgain = await callCoreFn(db, "core.fn_warehouse_list", base); + const warehouses = (listedAgain.data as { warehouses: Array<{ kind: string; project_id?: number }> }).warehouses; + assertEquals(warehouses.filter((w) => w.kind === "central").length, 1); + assertEquals(warehouses.filter((w) => w.kind === "project").length, 1); + + const supplier = await callCoreFn(db, "core.fn_supplier_create", { + tenant_id: TENANT_ID, + name: "Cemex Test", + }); + assertEquals(supplier.ok, true); + const supplierId = Number(((supplier.data as { supplier: { id: number } }).supplier).id); + + const units = await callCoreFn(db, "core.fn_measure_unit_list", base); + assertEquals(units.ok, true); + const bulto = ((units.data as { units: Array<{ id: number; code: string }> }).units) + .find((u) => u.code === "bulto"); + assertExists(bulto); + + const catalog = await callCoreFn(db, "core.fn_warehouse_material_upsert", { + ...base, + code: "VAR001", + name: "Varilla 3/8", + unit_id: bulto.id, + supplier_ids: [supplierId], + }); + assertEquals(catalog.ok, true); + const listedMats = await callCoreFn(db, "core.fn_warehouse_material_list", base); + assertEquals(listedMats.ok, true); + const mats = (listedMats.data as { materials: Array<{ code: string; suppliers: Array<{ id: number }> }> }).materials; + const varilla = mats.find((m) => m.code === "VAR001"); + assertExists(varilla); + assertEquals(varilla.suppliers.length, 1); + + const closed = await callCoreFn(db, "core.fn_warehouse_close_project", { + project_id: fx.projectId, + transfer_remaining: true, + closed_by_name: "Tester", + close_notes: "Cierre de prueba", + }); + assertEquals(closed.ok, true); + const afterClose = await callCoreFn(db, "core.fn_warehouse_list", base); + const openProjectWh = ((afterClose.data as { warehouses: Array<{ kind: string; status: string }> }).warehouses) + .filter((w) => w.kind === "project" && w.status === "open"); + assertEquals(openProjectWh.length, 0); }); }); @@ -233,6 +286,37 @@ Deno.test("RPC control presupuestal: summary, items, chapters, deviations", asyn }); }); +Deno.test("RPC catálogos: proveedores y unidades de medida", async () => { + await withTestDb(async (db) => { + const created = await callCoreFn(db, "core.fn_supplier_create", { + tenant_id: TENANT_ID, + name: "Home Depot", + rfc: "HDM123456ABC", + phone: "9980000000", + }); + assertEquals(created.ok, true, `crear proveedor: ${JSON.stringify(created)}`); + const supplier = (created.data as { supplier: { id: number; rfc: string } }).supplier; + assertEquals(supplier.rfc, "HDM123456ABC"); + + const listed = await callCoreFn(db, "core.fn_supplier_list", { tenant_id: TENANT_ID, status: "activo" }); + assertEquals(listed.ok, true); + const suppliers = (listed.data as { suppliers: { name: string }[] }).suppliers; + assert(suppliers.some((s) => s.name === "Home Depot")); + + const units = await callCoreFn(db, "core.fn_measure_unit_list", { tenant_id: TENANT_ID }); + assertEquals(units.ok, true); + const unitRows = (units.data as { units: { code: string }[] }).units; + assert(unitRows.some((u) => u.code === "bulto")); + + const extra = await callCoreFn(db, "core.fn_measure_unit_add", { + tenant_id: TENANT_ID, + code: "tinaco", + label: "Tinaco", + }); + assertEquals(extra.ok, true); + }); +}); + Deno.test("RPC IAM v2: roles y permisos por role_id", async () => { const url = Deno.env.get("DATABASE_URL_IAM"); if (!url) throw new Error("DATABASE_URL_IAM requerido"); diff --git a/api/expense_catalogs_http.ts b/api/expense_catalogs_http.ts new file mode 100644 index 0000000..f2d133c --- /dev/null +++ b/api/expense_catalogs_http.ts @@ -0,0 +1,67 @@ +import type { Hono } from "hono"; +import type { AuthUser } from "./auth.ts"; +import { tenantScope } from "./auth.ts"; +import { requireCoreAuth } from "./scope.ts"; +import { requireAnyPermission } from "./permissions.ts"; +import { callCoreFn } from "./rpc.ts"; +import { respondRpc, routeLabel } from "./http_errors.ts"; + +type App = Hono<{ Variables: { user: AuthUser; db: Db } }>; +type Db = import("./db.ts").Db; + +function tid(c: { get: (k: "user") => AuthUser }): number { + return tenantScope(c.get("user")) ?? 0; +} + +export function registerExpenseCatalogRoutes(app: App) { + const view = [...requireCoreAuth, requireAnyPermission("expenses.view", "settings.view", "warehouse.view")] as const; + const write = [...requireCoreAuth, requireAnyPermission("expenses.create", "settings.update", "warehouse.update")] as const; + + app.get("/v1/suppliers", ...view, async (c) => { + const db = c.get("db"); + const env = await callCoreFn(db, "core.fn_supplier_list", { + tenant_id: tid(c), + status: c.req.query("status"), + }, { route: routeLabel(c) }); + return respondRpc(c, env); + }); + + app.post("/v1/suppliers", ...write, async (c) => { + const body = await c.req.json>(); + const db = c.get("db"); + const env = await callCoreFn(db, "core.fn_supplier_create", { + ...body, + tenant_id: tid(c), + }, { route: routeLabel(c) }); + return respondRpc(c, env); + }); + + app.patch("/v1/suppliers/:id", ...write, async (c) => { + const body = await c.req.json>(); + const db = c.get("db"); + const env = await callCoreFn(db, "core.fn_supplier_update", { + ...body, + id: Number(c.req.param("id")), + tenant_id: tid(c), + }, { route: routeLabel(c) }); + return respondRpc(c, env); + }); + + app.get("/v1/measure-units", ...view, async (c) => { + const db = c.get("db"); + const env = await callCoreFn(db, "core.fn_measure_unit_list", { + tenant_id: tid(c), + }, { route: routeLabel(c) }); + return respondRpc(c, env); + }); + + app.post("/v1/measure-units", ...write, async (c) => { + const body = await c.req.json>(); + const db = c.get("db"); + const env = await callCoreFn(db, "core.fn_measure_unit_add", { + ...body, + tenant_id: tid(c), + }, { route: routeLabel(c) }); + return respondRpc(c, env); + }); +} diff --git a/api/main.ts b/api/main.ts index 3800628..cc70b27 100644 --- a/api/main.ts +++ b/api/main.ts @@ -66,6 +66,7 @@ import { import { generateBadgePdf, saveJobPdf, loadCurrentPhoto, badgeQrPng } from "./pdf.ts"; import { registerPayrollRoutes } from "./payroll_http.ts"; import { registerExpenseRoutes } from "./expenses_http.ts"; +import { registerExpenseCatalogRoutes } from "./expense_catalogs_http.ts"; import { registerWarehouseRoutes } from "./warehouse_http.ts"; import { registerCostControlRoutes } from "./cost_control_http.ts"; import { registerWorkProgramRoutes } from "./work_program_http.ts"; @@ -1416,6 +1417,7 @@ app.patch("/v1/badge-jobs/:id/people/:workerId", ...requireCoreAuth, requirePerm registerPayrollRoutes(app); registerExpenseRoutes(app); +registerExpenseCatalogRoutes(app); registerWarehouseRoutes(app); registerCostControlRoutes(app); registerWorkProgramRoutes(app); diff --git a/api/warehouse_http.ts b/api/warehouse_http.ts index 471e78c..b3e7e20 100644 --- a/api/warehouse_http.ts +++ b/api/warehouse_http.ts @@ -68,12 +68,15 @@ export function registerWarehouseRoutes(app: App) { app.post("/v1/projects/:id/warehouse/close", ...requireCoreAuth, requirePermission("warehouse.update"), async (c) => { const projectId = Number(c.req.param("id")); if (!await denyUnlessProjectScope(c, projectId)) return; - const body = await c.req.json<{ force?: boolean; close_notes?: string }>().catch(() => ({} as { force?: boolean; close_notes?: string })); + const body = await c.req.json<{ force?: boolean; close_notes?: string; transfer_remaining?: boolean }>().catch( + () => ({} as { force?: boolean; close_notes?: string; transfer_remaining?: boolean }), + ); const db = c.get("db"); const a = actor(c); const env = await callCoreFn(db, "core.fn_warehouse_close_project", { project_id: projectId, force: body.force, + transfer_remaining: body.transfer_remaining, closed_by_name: a.name, close_notes: body.close_notes, }, { route: routeLabel(c) }); @@ -119,12 +122,32 @@ export function registerWarehouseRoutes(app: App) { if (!await denyUnlessWarehouseCentral(c)) return; } else if (!await denyUnlessProjectScope(c, wh.project_id)) return; const env = await callCoreFn(db, "core.fn_warehouse_movement_list", { + tenant_id: tid(c), warehouse_id: whId, material_id: c.req.query("material_id"), }, { route: routeLabel(c) }); return respondRpc(c, env); }); + app.get("/v1/warehouses/movements/global", ...requireCoreAuth, requirePermission("warehouse.view"), async (c) => { + if (!await denyUnlessWarehouseCentral(c)) return; + const db = c.get("db"); + const env = await callCoreFn(db, "core.fn_warehouse_movement_list", { + tenant_id: tid(c), + global: true, + material_id: c.req.query("material_id"), + }, { route: routeLabel(c) }); + return respondRpc(c, env); + }); + + app.get("/v1/warehouse-materials", ...requireCoreAuth, requirePermission("warehouse.view"), async (c) => { + const db = c.get("db"); + const env = await callCoreFn(db, "core.fn_warehouse_material_list", { + tenant_id: tid(c), + }, { route: routeLabel(c) }); + return respondRpc(c, env); + }); + app.post("/v1/warehouse-materials", ...requireCoreAuth, requirePermission("warehouse.create"), async (c) => { const body = await c.req.json>(); const db = c.get("db"); @@ -132,6 +155,17 @@ export function registerWarehouseRoutes(app: App) { return respondRpc(c, env); }); + app.patch("/v1/warehouse-materials/:id", ...requireCoreAuth, requirePermission("warehouse.update"), async (c) => { + const body = await c.req.json>(); + const db = c.get("db"); + const env = await callCoreFn(db, "core.fn_warehouse_material_upsert", { + ...body, + id: Number(c.req.param("id")), + tenant_id: tid(c), + }, { route: routeLabel(c) }); + return respondRpc(c, env); + }); + app.post("/v1/warehouses/:id/entries", ...requireCoreAuth, requirePermission("warehouse.create"), async (c) => { const whId = Number(c.req.param("id")); const db = c.get("db"); diff --git a/db/core/changelog-master.xml b/db/core/changelog-master.xml index 0cccd4a..57082cd 100644 --- a/db/core/changelog-master.xml +++ b/db/core/changelog-master.xml @@ -40,5 +40,8 @@ + + + diff --git a/db/core/changesets/033-catalog-suppliers-units.sql b/db/core/changesets/033-catalog-suppliers-units.sql new file mode 100644 index 0000000..8a94123 --- /dev/null +++ b/db/core/changesets/033-catalog-suppliers-units.sql @@ -0,0 +1,397 @@ +--liquibase formatted sql +-- PANELS · core · catálogo de proveedores y unidades de medida (gastos) + +--changeset panel:core-033a-suppliers-table endDelimiter:; splitStatements:true +--preconditions onFail:MARK_RAN +--precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM information_schema.tables WHERE table_schema='core' AND table_name='suppliers' +CREATE TABLE core.suppliers ( + id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, + tenant_id INTEGER NOT NULL, + name TEXT NOT NULL, + legal_name TEXT NOT NULL DEFAULT '', + rfc TEXT NOT NULL DEFAULT '', + email TEXT NOT NULL DEFAULT '', + phone TEXT NOT NULL DEFAULT '', + address TEXT NOT NULL DEFAULT '', + city TEXT NOT NULL DEFAULT '', + state TEXT NOT NULL DEFAULT '', + postal_code TEXT NOT NULL DEFAULT '', + notes TEXT NOT NULL DEFAULT '', + status TEXT NOT NULL DEFAULT 'activo' CHECK (status IN ('activo', 'inactivo')), + created_at TIMESTAMPTZ NOT NULL DEFAULT now(), + updated_at TIMESTAMPTZ NOT NULL DEFAULT now() +); +CREATE UNIQUE INDEX idx_core_suppliers_rfc + ON core.suppliers (tenant_id, rfc) + WHERE rfc <> ''; +CREATE INDEX idx_core_suppliers_tenant_name ON core.suppliers (tenant_id, lower(name)); +GRANT SELECT, INSERT, UPDATE, DELETE ON core.suppliers TO panels_core_app; +GRANT USAGE, SELECT ON ALL SEQUENCES IN SCHEMA core TO panels_core_app; + +--changeset panel:core-033b-measure-units-table endDelimiter:; splitStatements:true +--preconditions onFail:MARK_RAN +--precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM information_schema.tables WHERE table_schema='core' AND table_name='measure_units' +CREATE TABLE core.measure_units ( + id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, + tenant_id INTEGER NOT NULL, + code TEXT NOT NULL, + label TEXT NOT NULL, + sort_order INTEGER NOT NULL DEFAULT 0, + status TEXT NOT NULL DEFAULT 'activo' CHECK (status IN ('activo', 'inactivo')), + created_at TIMESTAMPTZ NOT NULL DEFAULT now(), + UNIQUE (tenant_id, code) +); +CREATE INDEX idx_core_measure_units_tenant ON core.measure_units (tenant_id); +GRANT SELECT, INSERT, UPDATE, DELETE ON core.measure_units TO panels_core_app; + +--changeset panel:core-033c-expense-supplier-id endDelimiter:; splitStatements:true +ALTER TABLE core.expense_entries + ADD COLUMN IF NOT EXISTS supplier_id BIGINT REFERENCES core.suppliers(id) ON DELETE SET NULL; +CREATE INDEX IF NOT EXISTS idx_core_expense_entries_supplier ON core.expense_entries (supplier_id); + +--changeset panel:core-033d-rls-suppliers-units endDelimiter:; splitStatements:true +ALTER TABLE core.suppliers ENABLE ROW LEVEL SECURITY; +CREATE POLICY tenant_isolation ON core.suppliers + USING (tenant_id = NULLIF(current_setting('app.tenant_id', true), '')::integer) + WITH CHECK (tenant_id = NULLIF(current_setting('app.tenant_id', true), '')::integer); + +ALTER TABLE core.measure_units ENABLE ROW LEVEL SECURITY; +CREATE POLICY tenant_isolation ON core.measure_units + USING (tenant_id = NULLIF(current_setting('app.tenant_id', true), '')::integer) + WITH CHECK (tenant_id = NULLIF(current_setting('app.tenant_id', true), '')::integer); + +--changeset panel:core-033e-fn-measure-units-seed splitStatements:false +CREATE OR REPLACE FUNCTION core._measure_units_seed(p_tenant_id integer) +RETURNS void +LANGUAGE plpgsql +SET search_path = core +AS $$ +BEGIN + IF p_tenant_id IS NULL OR p_tenant_id <= 0 THEN + RETURN; + END IF; + IF EXISTS (SELECT 1 FROM measure_units WHERE tenant_id = p_tenant_id) THEN + RETURN; + END IF; + INSERT INTO measure_units (tenant_id, code, label, sort_order) VALUES + (p_tenant_id, 'pza', 'Pieza', 10), + (p_tenant_id, 'm', 'Metro', 20), + (p_tenant_id, 'ml', 'Metro lineal', 30), + (p_tenant_id, 'm2', 'Metro cuadrado', 40), + (p_tenant_id, 'm3', 'Metro cúbico', 50), + (p_tenant_id, 'kg', 'Kilogramo', 60), + (p_tenant_id, 'ton', 'Tonelada', 70), + (p_tenant_id, 'lt', 'Litro', 80), + (p_tenant_id, 'gl', 'Galón', 90), + (p_tenant_id, 'bulto', 'Bulto', 100), + (p_tenant_id, 'saco', 'Saco', 110), + (p_tenant_id, 'jgo', 'Juego', 120), + (p_tenant_id, 'lote', 'Lote', 130), + (p_tenant_id, 'par', 'Par', 140), + (p_tenant_id, 'hr', 'Hora', 150), + (p_tenant_id, 'dia', 'Día', 160), + (p_tenant_id, 'via', 'Viaje', 170); +END; +$$; + +--changeset panel:core-033f-fn-supplier-list splitStatements:false +CREATE OR REPLACE FUNCTION core.fn_supplier_list(payload jsonb) +RETURNS jsonb +LANGUAGE plpgsql +SECURITY INVOKER +SET search_path = core +AS $$ +DECLARE + v_tid integer := core._cost_tenant_id(payload); + v_status text := nullif(btrim(payload->>'status'), ''); + v_rows jsonb; +BEGIN + SELECT COALESCE(jsonb_agg(to_jsonb(s) ORDER BY lower(s.name), s.id), '[]'::jsonb) + INTO v_rows + FROM suppliers s + WHERE s.tenant_id = v_tid + AND (v_status IS NULL OR s.status = v_status); + RETURN core.rpc_ok( + jsonb_build_object('suppliers', v_rows, 'count', jsonb_array_length(v_rows)), + format('Catálogo de proveedores: %s registro(s) para tenant %s', jsonb_array_length(v_rows), v_tid), + jsonb_build_object('fn', 'fn_supplier_list', 'tenant_id', v_tid, 'count', jsonb_array_length(v_rows)) + ); +EXCEPTION WHEN OTHERS THEN + RETURN core.rpc_from_exception('fn_supplier_list', SQLSTATE, SQLERRM); +END; +$$; + +--changeset panel:core-033g-fn-supplier-create splitStatements:false +CREATE OR REPLACE FUNCTION core.fn_supplier_create(payload jsonb) +RETURNS jsonb +LANGUAGE plpgsql +SECURITY INVOKER +SET search_path = core +AS $$ +DECLARE + v_tid integer := core._cost_tenant_id(payload); + v_name text := coalesce(nullif(btrim(payload->>'name'), ''), ''); + v_legal text := coalesce(nullif(btrim(payload->>'legal_name'), ''), ''); + v_rfc text := upper(regexp_replace(coalesce(payload->>'rfc', ''), '\s+', '', 'g')); + v_email text := coalesce(nullif(btrim(payload->>'email'), ''), ''); + v_phone text := coalesce(nullif(btrim(payload->>'phone'), ''), ''); + v_address text := coalesce(nullif(btrim(payload->>'address'), ''), ''); + v_city text := coalesce(nullif(btrim(payload->>'city'), ''), ''); + v_state text := coalesce(nullif(btrim(payload->>'state'), ''), ''); + v_zip text := coalesce(nullif(btrim(payload->>'postal_code'), ''), ''); + v_notes text := coalesce(nullif(btrim(payload->>'notes'), ''), ''); + v_id bigint; + v_row jsonb; +BEGIN + IF v_name = '' THEN + RETURN core.rpc_err('VALIDATION', 'fn_supplier_create: el nombre del proveedor es obligatorio', + jsonb_build_object('fn', 'fn_supplier_create', 'field', 'name')); + END IF; + IF v_rfc <> '' AND char_length(v_rfc) NOT IN (12, 13) THEN + RETURN core.rpc_err('VALIDATION', format('fn_supplier_create: RFC %s no tiene 12 o 13 caracteres', v_rfc), + jsonb_build_object('fn', 'fn_supplier_create', 'field', 'rfc')); + END IF; + INSERT INTO suppliers ( + tenant_id, name, legal_name, rfc, email, phone, address, city, state, postal_code, notes + ) VALUES ( + v_tid, v_name, v_legal, v_rfc, v_email, v_phone, v_address, v_city, v_state, v_zip, v_notes + ) RETURNING id INTO v_id; + SELECT to_jsonb(s) INTO v_row FROM suppliers s WHERE id = v_id; + RETURN core.rpc_created( + jsonb_build_object('supplier', v_row), + format('Proveedor %s registrado', v_name), + jsonb_build_object('fn', 'fn_supplier_create', 'id', v_id, 'tenant_id', v_tid) + ); +EXCEPTION + WHEN unique_violation THEN + RETURN core.rpc_err('CONFLICT', format('Ya existe un proveedor con RFC %s en este tenant', v_rfc), + jsonb_build_object('fn', 'fn_supplier_create', 'rfc', v_rfc)); + WHEN OTHERS THEN + RETURN core.rpc_from_exception('fn_supplier_create', SQLSTATE, SQLERRM); +END; +$$; + +--changeset panel:core-033h-fn-supplier-update splitStatements:false +CREATE OR REPLACE FUNCTION core.fn_supplier_update(payload jsonb) +RETURNS jsonb +LANGUAGE plpgsql +SECURITY INVOKER +SET search_path = core +AS $$ +DECLARE + v_id bigint := NULLIF(payload->>'id', '')::bigint; + v_tid integer := core._cost_tenant_id(payload); + v_rfc text; + v_row jsonb; +BEGIN + IF v_id IS NULL THEN + RETURN core.rpc_err('VALIDATION', 'fn_supplier_update: id es obligatorio', + jsonb_build_object('fn', 'fn_supplier_update', 'field', 'id')); + END IF; + IF NOT EXISTS (SELECT 1 FROM suppliers WHERE id = v_id AND tenant_id = v_tid) THEN + RETURN core.rpc_err('NOT_FOUND', format('fn_supplier_update: proveedor id=%s no encontrado', v_id), + jsonb_build_object('fn', 'fn_supplier_update', 'id', v_id)); + END IF; + v_rfc := upper(regexp_replace(coalesce(payload->>'rfc', ''), '\s+', '', 'g')); + IF payload ? 'rfc' AND v_rfc <> '' AND char_length(v_rfc) NOT IN (12, 13) THEN + RETURN core.rpc_err('VALIDATION', format('fn_supplier_update: RFC %s no tiene 12 o 13 caracteres', v_rfc), + jsonb_build_object('fn', 'fn_supplier_update', 'field', 'rfc')); + END IF; + UPDATE suppliers SET + name = CASE WHEN payload ? 'name' THEN coalesce(nullif(btrim(payload->>'name'), ''), name) ELSE name END, + legal_name = CASE WHEN payload ? 'legal_name' THEN coalesce(nullif(btrim(payload->>'legal_name'), ''), '') ELSE legal_name END, + rfc = CASE WHEN payload ? 'rfc' THEN v_rfc ELSE rfc END, + email = CASE WHEN payload ? 'email' THEN coalesce(nullif(btrim(payload->>'email'), ''), '') ELSE email END, + phone = CASE WHEN payload ? 'phone' THEN coalesce(nullif(btrim(payload->>'phone'), ''), '') ELSE phone END, + address = CASE WHEN payload ? 'address' THEN coalesce(nullif(btrim(payload->>'address'), ''), '') ELSE address END, + city = CASE WHEN payload ? 'city' THEN coalesce(nullif(btrim(payload->>'city'), ''), '') ELSE city END, + state = CASE WHEN payload ? 'state' THEN coalesce(nullif(btrim(payload->>'state'), ''), '') ELSE state END, + postal_code = CASE WHEN payload ? 'postal_code' THEN coalesce(nullif(btrim(payload->>'postal_code'), ''), '') ELSE postal_code END, + notes = CASE WHEN payload ? 'notes' THEN coalesce(nullif(btrim(payload->>'notes'), ''), '') ELSE notes END, + status = CASE WHEN payload ? 'status' THEN coalesce(nullif(btrim(payload->>'status'), ''), status) ELSE status END, + updated_at = now() + WHERE id = v_id AND tenant_id = v_tid; + SELECT to_jsonb(s) INTO v_row FROM suppliers s WHERE id = v_id; + RETURN core.rpc_ok( + jsonb_build_object('supplier', v_row), + format('Proveedor id=%s actualizado', v_id), + jsonb_build_object('fn', 'fn_supplier_update', 'id', v_id) + ); +EXCEPTION + WHEN unique_violation THEN + RETURN core.rpc_err('CONFLICT', 'Ya existe otro proveedor con ese RFC en este tenant', + jsonb_build_object('fn', 'fn_supplier_update', 'id', v_id)); + WHEN OTHERS THEN + RETURN core.rpc_from_exception('fn_supplier_update', SQLSTATE, SQLERRM); +END; +$$; + +--changeset panel:core-033i-fn-measure-unit-list splitStatements:false +CREATE OR REPLACE FUNCTION core.fn_measure_unit_list(payload jsonb) +RETURNS jsonb +LANGUAGE plpgsql +SECURITY INVOKER +SET search_path = core +AS $$ +DECLARE + v_tid integer := core._cost_tenant_id(payload); + v_rows jsonb; +BEGIN + PERFORM core._measure_units_seed(v_tid); + SELECT COALESCE(jsonb_agg(to_jsonb(u) ORDER BY u.sort_order, u.code), '[]'::jsonb) + INTO v_rows + FROM measure_units u + WHERE u.tenant_id = v_tid + AND u.status = 'activo'; + RETURN core.rpc_ok( + jsonb_build_object('units', v_rows, 'count', jsonb_array_length(v_rows)), + format('Unidades de medida del tenant %s: %s registro(s)', v_tid, jsonb_array_length(v_rows)), + jsonb_build_object('fn', 'fn_measure_unit_list', 'tenant_id', v_tid, 'count', jsonb_array_length(v_rows)) + ); +EXCEPTION WHEN OTHERS THEN + RETURN core.rpc_from_exception('fn_measure_unit_list', SQLSTATE, SQLERRM); +END; +$$; + +--changeset panel:core-033j-fn-measure-unit-add splitStatements:false +CREATE OR REPLACE FUNCTION core.fn_measure_unit_add(payload jsonb) +RETURNS jsonb +LANGUAGE plpgsql +SECURITY INVOKER +SET search_path = core +AS $$ +DECLARE + v_tid integer := core._cost_tenant_id(payload); + v_code text := lower(regexp_replace(btrim(COALESCE(payload->>'code', '')), '\s+', '', 'g')); + v_label text := COALESCE(NULLIF(btrim(payload->>'label'), ''), v_code); + v_id bigint; + v_row jsonb; +BEGIN + IF v_code = '' THEN + RETURN core.rpc_err('VALIDATION', 'fn_measure_unit_add: el código de unidad es obligatorio', + jsonb_build_object('fn', 'fn_measure_unit_add', 'field', 'code')); + END IF; + PERFORM core._measure_units_seed(v_tid); + INSERT INTO measure_units (tenant_id, code, label, sort_order) + VALUES (v_tid, v_code, v_label, 500) + RETURNING id INTO v_id; + SELECT to_jsonb(u) INTO v_row FROM measure_units u WHERE id = v_id; + RETURN core.rpc_created( + jsonb_build_object('unit', v_row), + format('Unidad de medida %s (%s) agregada', v_label, v_code), + jsonb_build_object('fn', 'fn_measure_unit_add', 'id', v_id, 'tenant_id', v_tid) + ); +EXCEPTION + WHEN unique_violation THEN + RETURN core.rpc_err('CONFLICT', format('Ya existe la unidad %s en este tenant', v_code), + jsonb_build_object('fn', 'fn_measure_unit_add', 'code', v_code)); + WHEN OTHERS THEN + RETURN core.rpc_from_exception('fn_measure_unit_add', SQLSTATE, SQLERRM); +END; +$$; + +--changeset panel:core-033k-fn-expense-create-supplier splitStatements:false +CREATE OR REPLACE FUNCTION core.fn_expense_create(payload jsonb) +RETURNS jsonb +LANGUAGE plpgsql +SECURITY INVOKER +SET search_path = core +AS $$ +DECLARE + v_tid integer := core._cost_tenant_id(payload); + v_company_id bigint := NULLIF(payload->>'company_id', '')::bigint; + v_project_id bigint := NULLIF(payload->>'project_id', '')::bigint; + v_expense_date date := COALESCE(NULLIF(payload->>'expense_date', '')::date, CURRENT_DATE); + v_description text := coalesce(nullif(btrim(payload->>'description'), ''), ''); + v_budget_item_id bigint := NULLIF(payload->>'budget_item_id', '')::bigint; + v_budget_chapter_id bigint := NULLIF(payload->>'budget_chapter_id', '')::bigint; + v_quantity numeric := COALESCE((payload->>'quantity')::numeric, 0); + v_unit text := coalesce(nullif(btrim(payload->>'unit'), ''), ''); + v_unit_price numeric := COALESCE((payload->>'unit_price')::numeric, 0); + v_subtotal_in numeric := COALESCE((payload->>'subtotal')::numeric, 0); + v_iva_rate numeric; + v_tax_included boolean := COALESCE((payload->>'tax_included')::boolean, false); + v_total_in numeric := (payload->>'total')::numeric; + v_subtotal numeric; v_iva_amount numeric; v_total numeric; + v_is_deductible boolean := COALESCE((payload->>'is_deductible')::boolean, true); + v_counts_toward_budget boolean := COALESCE((payload->>'counts_toward_budget')::boolean, true); + v_supplier_id bigint := NULLIF(payload->>'supplier_id', '')::bigint; + v_supplier_name text := coalesce(nullif(btrim(payload->>'supplier_name'), ''), ''); + v_supplier_rfc text := upper(coalesce(nullif(btrim(payload->>'supplier_rfc'), ''), '')); + v_notes text := coalesce(nullif(btrim(payload->>'notes'), ''), ''); + v_created_by_id integer := NULLIF(payload->>'created_by_id', '')::integer; + v_created_by_name text := coalesce(nullif(btrim(payload->>'created_by_name'), ''), ''); + v_id bigint; + v_warning jsonb; + v_row jsonb; +BEGIN + IF v_company_id IS NULL THEN + RETURN core.rpc_err('VALIDATION', 'fn_expense_create: company_id es obligatorio', + jsonb_build_object('fn', 'fn_expense_create', 'field', 'company_id')); + END IF; + IF v_description = '' THEN + RETURN core.rpc_err('VALIDATION', 'fn_expense_create: description es obligatoria', + jsonb_build_object('fn', 'fn_expense_create', 'field', 'description')); + END IF; + IF NOT EXISTS (SELECT 1 FROM companies WHERE id = v_company_id) THEN + RETURN core.rpc_err('VALIDATION', format('fn_expense_create: empresa id=%s no encontrada', v_company_id), + jsonb_build_object('fn', 'fn_expense_create', 'company_id', v_company_id)); + END IF; + IF v_project_id IS NOT NULL AND NOT EXISTS (SELECT 1 FROM projects WHERE id = v_project_id) THEN + RETURN core.rpc_err('NOT_FOUND', format('fn_expense_create: proyecto id=%s no encontrado', v_project_id), + jsonb_build_object('fn', 'fn_expense_create', 'project_id', v_project_id)); + END IF; + IF v_supplier_id IS NOT NULL THEN + SELECT name, rfc INTO v_supplier_name, v_supplier_rfc + FROM suppliers + WHERE id = v_supplier_id AND tenant_id = v_tid AND status = 'activo'; + IF NOT FOUND THEN + RETURN core.rpc_err('NOT_FOUND', format('fn_expense_create: proveedor id=%s no encontrado', v_supplier_id), + jsonb_build_object('fn', 'fn_expense_create', 'supplier_id', v_supplier_id)); + END IF; + END IF; + IF v_subtotal_in <= 0 AND v_quantity > 0 AND v_unit_price > 0 THEN + v_subtotal_in := round(v_quantity * v_unit_price, 2); + END IF; + SELECT default_iva_rate INTO v_iva_rate FROM core._cost_settings(v_tid); + v_iva_rate := COALESCE((payload->>'iva_rate')::numeric, v_iva_rate); + SELECT c.subtotal, c.iva_amount, c.total INTO v_subtotal, v_iva_amount, v_total + FROM core._cost_calc_amounts(v_subtotal_in, v_iva_rate, v_tax_included, v_total_in) c; + IF v_budget_item_id IS NOT NULL THEN + SELECT chapter_id INTO v_budget_chapter_id FROM budget_items WHERE id = v_budget_item_id; + END IF; + INSERT INTO expense_entries ( + tenant_id, company_id, project_id, expense_date, source, description, + supplier_id, supplier_name, supplier_rfc, budget_chapter_id, budget_item_id, + quantity, unit, unit_price, subtotal, iva_rate, iva_amount, total, + tax_included, is_deductible, counts_toward_budget, status, + created_by_id, created_by_name, notes + ) VALUES ( + v_tid, v_company_id, v_project_id, v_expense_date, 'manual', v_description, + v_supplier_id, v_supplier_name, v_supplier_rfc, v_budget_chapter_id, v_budget_item_id, + v_quantity, v_unit, v_unit_price, v_subtotal, v_iva_rate, v_iva_amount, v_total, + v_tax_included, v_is_deductible, v_counts_toward_budget, 'confirmed', + v_created_by_id, v_created_by_name, v_notes + ) RETURNING id INTO v_id; + IF v_counts_toward_budget AND v_budget_item_id IS NOT NULL THEN + v_warning := core._cost_budget_warning(v_tid, v_budget_item_id, 0, 0); + END IF; + SELECT to_jsonb(e) INTO v_row FROM expense_entries e WHERE id = v_id; + RETURN core.rpc_created( + jsonb_build_object('expense', v_row, 'budget_warning', v_warning), + format('Gasto registrado por %s (subtotal %s, IVA %s)', v_description, v_subtotal, v_iva_amount), + jsonb_build_object('fn', 'fn_expense_create', 'id', v_id) + ); +EXCEPTION WHEN OTHERS THEN + RETURN core.rpc_from_exception('fn_expense_create', SQLSTATE, SQLERRM); +END; +$$; + +--changeset panel:core-033l-grants endDelimiter:; splitStatements:true +GRANT EXECUTE ON FUNCTION core._measure_units_seed(integer) TO panels_core_app; +GRANT EXECUTE ON FUNCTION core.fn_supplier_list(jsonb) TO panels_core_app; +GRANT EXECUTE ON FUNCTION core.fn_supplier_create(jsonb) TO panels_core_app; +GRANT EXECUTE ON FUNCTION core.fn_supplier_update(jsonb) TO panels_core_app; +GRANT EXECUTE ON FUNCTION core.fn_measure_unit_list(jsonb) TO panels_core_app; +GRANT EXECUTE ON FUNCTION core.fn_measure_unit_add(jsonb) TO panels_core_app; +GRANT EXECUTE ON FUNCTION core.fn_expense_create(jsonb) TO panels_core_app; diff --git a/db/core/changesets/034-fn-expense-update-reclassify.sql b/db/core/changesets/034-fn-expense-update-reclassify.sql new file mode 100644 index 0000000..15e1c3b --- /dev/null +++ b/db/core/changesets/034-fn-expense-update-reclassify.sql @@ -0,0 +1,111 @@ +--liquibase formatted sql +-- PANELS · core · reclasificar gasto (concepto, proveedor, obra) + +--changeset panel:core-034a-fn-expense-update-reclassify splitStatements:false +CREATE OR REPLACE FUNCTION core.fn_expense_update(payload jsonb) +RETURNS jsonb +LANGUAGE plpgsql +SECURITY INVOKER +SET search_path = core +AS $$ +DECLARE + v_id bigint := NULLIF(payload->>'id', '')::bigint; + v_tid integer := core._cost_tenant_id(payload); + v_cur expense_entries%ROWTYPE; + v_warning jsonb; + v_row jsonb; + v_subtotal numeric; v_iva_amount numeric; v_total numeric; + v_line numeric; + v_supplier_id bigint; + v_supplier_name text; + v_supplier_rfc text; + v_budget_item_id bigint; + v_chapter_id bigint; +BEGIN + IF v_id IS NULL THEN + RETURN core.rpc_err('VALIDATION', 'fn_expense_update: id es obligatorio', + jsonb_build_object('fn', 'fn_expense_update', 'field', 'id')); + END IF; + SELECT * INTO v_cur FROM expense_entries WHERE id = v_id; + IF NOT FOUND THEN + RETURN core.rpc_err('NOT_FOUND', format('fn_expense_update: gasto id=%s no encontrado', v_id), + jsonb_build_object('fn', 'fn_expense_update', 'id', v_id)); + END IF; + IF v_cur.is_locked OR v_cur.source <> 'manual' THEN + RETURN core.rpc_err('VALIDATION', 'fn_expense_update: solo se editan gastos manuales no bloqueados', + jsonb_build_object('fn', 'fn_expense_update', 'id', v_id, 'source', v_cur.source)); + END IF; + + IF payload ? 'supplier_id' THEN + v_supplier_id := NULLIF(payload->>'supplier_id', '')::bigint; + IF v_supplier_id IS NOT NULL THEN + SELECT name, rfc INTO v_supplier_name, v_supplier_rfc + FROM suppliers + WHERE id = v_supplier_id AND tenant_id = v_tid AND status = 'activo'; + IF NOT FOUND THEN + RETURN core.rpc_err('NOT_FOUND', format('fn_expense_update: proveedor id=%s no encontrado', v_supplier_id), + jsonb_build_object('fn', 'fn_expense_update', 'supplier_id', v_supplier_id)); + END IF; + ELSE + v_supplier_name := ''; + v_supplier_rfc := ''; + END IF; + END IF; + + IF payload ? 'budget_item_id' THEN + v_budget_item_id := NULLIF(payload->>'budget_item_id', '')::bigint; + IF v_budget_item_id IS NOT NULL THEN + SELECT chapter_id INTO v_chapter_id FROM budget_items WHERE id = v_budget_item_id; + END IF; + END IF; + + UPDATE expense_entries SET + expense_date = COALESCE(NULLIF(payload->>'expense_date', '')::date, expense_date), + description = COALESCE(nullif(btrim(payload->>'description'), ''), description), + project_id = CASE WHEN payload ? 'project_id' THEN NULLIF(payload->>'project_id', '')::bigint ELSE project_id END, + supplier_id = CASE WHEN payload ? 'supplier_id' THEN v_supplier_id ELSE supplier_id END, + supplier_name = CASE + WHEN payload ? 'supplier_id' THEN coalesce(v_supplier_name, '') + WHEN payload ? 'supplier_name' THEN coalesce(nullif(btrim(payload->>'supplier_name'), ''), '') + ELSE supplier_name END, + supplier_rfc = CASE + WHEN payload ? 'supplier_id' THEN coalesce(v_supplier_rfc, '') + WHEN payload ? 'supplier_rfc' THEN upper(coalesce(nullif(btrim(payload->>'supplier_rfc'), ''), '')) + ELSE supplier_rfc END, + budget_item_id = CASE WHEN payload ? 'budget_item_id' THEN v_budget_item_id ELSE budget_item_id END, + budget_chapter_id = CASE WHEN payload ? 'budget_item_id' THEN v_chapter_id ELSE budget_chapter_id END, + quantity = CASE WHEN payload ? 'quantity' THEN COALESCE((payload->>'quantity')::numeric, 0) ELSE quantity END, + unit = CASE WHEN payload ? 'unit' THEN coalesce(nullif(btrim(payload->>'unit'), ''), '') ELSE unit END, + unit_price = CASE WHEN payload ? 'unit_price' THEN COALESCE((payload->>'unit_price')::numeric, 0) ELSE unit_price END, + tax_included = CASE WHEN payload ? 'tax_included' THEN COALESCE((payload->>'tax_included')::boolean, false) ELSE tax_included END, + notes = CASE WHEN payload ? 'notes' THEN coalesce(nullif(btrim(payload->>'notes'), ''), '') ELSE notes END + WHERE id = v_id; + SELECT * INTO v_cur FROM expense_entries WHERE id = v_id; + v_line := CASE + WHEN v_cur.quantity > 0 AND v_cur.unit_price > 0 THEN round(v_cur.quantity * v_cur.unit_price, 2) + ELSE v_cur.subtotal + END; + SELECT c.subtotal, c.iva_amount, c.total INTO v_subtotal, v_iva_amount, v_total + FROM core._cost_calc_amounts( + v_line, + v_cur.iva_rate, + v_cur.tax_included, + CASE WHEN v_cur.tax_included THEN v_line ELSE NULL END + ) c; + UPDATE expense_entries SET subtotal = v_subtotal, iva_amount = v_iva_amount, total = v_total WHERE id = v_id; + IF v_cur.counts_toward_budget AND v_cur.budget_item_id IS NOT NULL THEN + v_warning := core._cost_budget_warning(v_tid, v_cur.budget_item_id, 0, 0); + END IF; + SELECT to_jsonb(e) INTO v_row FROM expense_entries e WHERE id = v_id; + RETURN core.rpc_ok( + jsonb_build_object('expense', v_row, 'budget_warning', v_warning), + format('Gasto id=%s actualizado', v_id), + jsonb_build_object('fn', 'fn_expense_update', 'id', v_id, 'budget_item_id', v_cur.budget_item_id) + ); +EXCEPTION WHEN OTHERS THEN + RETURN core.rpc_from_exception('fn_expense_update', SQLSTATE, SQLERRM); +END; +$$; + +--changeset panel:core-034b-fn-expense-update-grant endDelimiter:; splitStatements:true +GRANT EXECUTE ON FUNCTION core.fn_expense_update(jsonb) TO panels_core_app; diff --git a/db/core/changesets/035-warehouse-materials-catalog.sql b/db/core/changesets/035-warehouse-materials-catalog.sql new file mode 100644 index 0000000..5193cc4 --- /dev/null +++ b/db/core/changesets/035-warehouse-materials-catalog.sql @@ -0,0 +1,464 @@ +--liquibase formatted sql +-- PANELS · core · catálogo de materiales de almacén (unidades + proveedores) + +--changeset panel:core-035a-warehouse-materials-unit-id endDelimiter:; splitStatements:true +ALTER TABLE core.warehouse_materials + ADD COLUMN IF NOT EXISTS unit_id BIGINT REFERENCES core.measure_units(id) ON DELETE SET NULL; +CREATE INDEX IF NOT EXISTS idx_core_warehouse_materials_unit ON core.warehouse_materials(unit_id); + +--changeset panel:core-035b-warehouse-material-suppliers endDelimiter:; splitStatements:true +--preconditions onFail:MARK_RAN +--precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM information_schema.tables WHERE table_schema='core' AND table_name='warehouse_material_suppliers' +CREATE TABLE core.warehouse_material_suppliers ( + material_id BIGINT NOT NULL REFERENCES core.warehouse_materials(id) ON DELETE CASCADE, + supplier_id BIGINT NOT NULL REFERENCES core.suppliers(id) ON DELETE CASCADE, + PRIMARY KEY (material_id, supplier_id) +); +CREATE INDEX idx_core_wh_mat_suppliers_supplier ON core.warehouse_material_suppliers(supplier_id); +GRANT SELECT, INSERT, UPDATE, DELETE ON core.warehouse_material_suppliers TO panels_core_app; + +--changeset panel:core-035c-rls-warehouse-material-suppliers endDelimiter:; splitStatements:true +--preconditions onFail:MARK_RAN +--precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM pg_policies WHERE schemaname='core' AND tablename='warehouse_material_suppliers' AND policyname='tenant_isolation' +ALTER TABLE core.warehouse_material_suppliers ENABLE ROW LEVEL SECURITY; +CREATE POLICY tenant_isolation ON core.warehouse_material_suppliers + USING (EXISTS ( + SELECT 1 FROM core.warehouse_materials m + WHERE m.id = material_id + AND m.tenant_id = NULLIF(current_setting('app.tenant_id', true), '')::integer + )) + WITH CHECK (EXISTS ( + SELECT 1 FROM core.warehouse_materials m + WHERE m.id = material_id + AND m.tenant_id = NULLIF(current_setting('app.tenant_id', true), '')::integer + )); + +--changeset panel:core-035d-fn-warehouse-material-list splitStatements:false +CREATE OR REPLACE FUNCTION core.fn_warehouse_material_list(payload jsonb) +RETURNS jsonb +LANGUAGE plpgsql +SECURITY INVOKER +SET search_path = core +AS $$ +DECLARE + v_tid integer := core._cost_tenant_id(payload); + v_rows jsonb; +BEGIN + SELECT COALESCE(jsonb_agg(to_jsonb(x) ORDER BY lower(x.name), x.code), '[]'::jsonb) + INTO v_rows + FROM ( + SELECT + m.id, + m.code, + m.name, + m.unit, + m.unit_id, + COALESCE(u.label, m.unit) AS unit_label, + COALESCE(( + SELECT jsonb_agg(jsonb_build_object('id', s.id, 'name', s.name) ORDER BY lower(s.name)) + FROM warehouse_material_suppliers ms + JOIN suppliers s ON s.id = ms.supplier_id + WHERE ms.material_id = m.id + ), '[]'::jsonb) AS suppliers + FROM warehouse_materials m + LEFT JOIN measure_units u ON u.id = m.unit_id + WHERE m.tenant_id = v_tid + ) x; + RETURN core.rpc_ok( + jsonb_build_object('materials', v_rows, 'count', jsonb_array_length(v_rows)), + format('Catálogo de materiales del tenant %s: %s registro(s)', v_tid, jsonb_array_length(v_rows)), + jsonb_build_object('fn', 'fn_warehouse_material_list', 'tenant_id', v_tid, 'count', jsonb_array_length(v_rows)) + ); +EXCEPTION WHEN OTHERS THEN + RETURN core.rpc_from_exception('fn_warehouse_material_list', SQLSTATE, SQLERRM); +END; +$$; + +--changeset panel:core-035e-fn-warehouse-material-upsert splitStatements:false +CREATE OR REPLACE FUNCTION core.fn_warehouse_material_upsert(payload jsonb) +RETURNS jsonb +LANGUAGE plpgsql +SECURITY INVOKER +SET search_path = core +AS $$ +DECLARE + v_tid integer := core._cost_tenant_id(payload); + v_id bigint := NULLIF(payload->>'id', '')::bigint; + v_code text := upper(coalesce(nullif(btrim(payload->>'code'), ''), '')); + v_name text := coalesce(nullif(btrim(payload->>'name'), ''), ''); + v_unit text := coalesce(nullif(btrim(payload->>'unit'), ''), ''); + v_unit_id bigint := NULLIF(payload->>'unit_id', '')::bigint; + v_row jsonb; +BEGIN + IF v_unit_id IS NOT NULL THEN + SELECT code INTO v_unit FROM measure_units WHERE id = v_unit_id AND tenant_id = v_tid; + IF NOT FOUND THEN + RETURN core.rpc_err('VALIDATION', format('fn_warehouse_material_upsert: unidad id=%s no encontrada', v_unit_id), + jsonb_build_object('fn', 'fn_warehouse_material_upsert', 'unit_id', v_unit_id)); + END IF; + END IF; + IF v_id IS NOT NULL THEN + IF NOT EXISTS (SELECT 1 FROM warehouse_materials WHERE id = v_id AND tenant_id = v_tid) THEN + RETURN core.rpc_err('NOT_FOUND', format('fn_warehouse_material_upsert: material id=%s no encontrado', v_id), + jsonb_build_object('fn', 'fn_warehouse_material_upsert', 'id', v_id)); + END IF; + IF v_code = '' THEN + SELECT code INTO v_code FROM warehouse_materials WHERE id = v_id; + END IF; + IF v_name = '' THEN + SELECT name INTO v_name FROM warehouse_materials WHERE id = v_id; + END IF; + UPDATE warehouse_materials + SET code = v_code, + name = v_name, + unit = CASE WHEN payload ? 'unit' OR payload ? 'unit_id' THEN v_unit ELSE unit END, + unit_id = CASE WHEN payload ? 'unit_id' THEN v_unit_id ELSE unit_id END + WHERE id = v_id AND tenant_id = v_tid; + ELSE + IF v_code = '' OR v_name = '' THEN + RETURN core.rpc_err('VALIDATION', 'fn_warehouse_material_upsert: code y name son obligatorios', + jsonb_build_object('fn', 'fn_warehouse_material_upsert')); + END IF; + INSERT INTO warehouse_materials (tenant_id, code, name, unit, unit_id) + VALUES (v_tid, v_code, v_name, v_unit, v_unit_id) + ON CONFLICT (tenant_id, code) DO UPDATE + SET name = EXCLUDED.name, + unit = EXCLUDED.unit, + unit_id = COALESCE(EXCLUDED.unit_id, warehouse_materials.unit_id) + RETURNING id INTO v_id; + END IF; + IF payload ? 'supplier_ids' THEN + DELETE FROM warehouse_material_suppliers WHERE material_id = v_id; + INSERT INTO warehouse_material_suppliers (material_id, supplier_id) + SELECT v_id, x.sid + FROM ( + SELECT DISTINCT NULLIF(elem #>> '{}', '')::bigint AS sid + FROM jsonb_array_elements( + CASE WHEN jsonb_typeof(payload->'supplier_ids') = 'array' + THEN payload->'supplier_ids' + ELSE '[]'::jsonb + END + ) elem + ) x + WHERE x.sid IS NOT NULL + AND EXISTS (SELECT 1 FROM suppliers s WHERE s.id = x.sid AND s.tenant_id = v_tid); + END IF; + SELECT to_jsonb(x) INTO v_row + FROM ( + SELECT + m.id, m.code, m.name, m.unit, m.unit_id, + COALESCE(u.label, m.unit) AS unit_label, + COALESCE(( + SELECT jsonb_agg(jsonb_build_object('id', s.id, 'name', s.name) ORDER BY lower(s.name)) + FROM warehouse_material_suppliers ms + JOIN suppliers s ON s.id = ms.supplier_id + WHERE ms.material_id = m.id + ), '[]'::jsonb) AS suppliers + FROM warehouse_materials m + LEFT JOIN measure_units u ON u.id = m.unit_id + WHERE m.id = v_id + ) x; + RETURN core.rpc_ok( + v_row, + format('Material %s (%s) registrado', v_code, v_name), + jsonb_build_object('fn', 'fn_warehouse_material_upsert', 'id', v_id) + ); +EXCEPTION WHEN unique_violation THEN + RETURN core.rpc_err('CONFLICT', format('Ya existe un material con clave %s', v_code), + jsonb_build_object('fn', 'fn_warehouse_material_upsert', 'code', v_code)); +WHEN OTHERS THEN + RETURN core.rpc_from_exception('fn_warehouse_material_upsert', SQLSTATE, SQLERRM); +END; +$$; + +--changeset panel:core-035f-fn-warehouse-stock-list splitStatements:false +CREATE OR REPLACE FUNCTION core.fn_warehouse_stock_list(payload jsonb) +RETURNS jsonb +LANGUAGE plpgsql +SECURITY INVOKER +SET search_path = core +AS $$ +DECLARE + v_warehouse_id bigint := NULLIF(payload->>'warehouse_id', '')::bigint; + v_global boolean := COALESCE((payload->>'global')::boolean, false); + v_tid integer := core._cost_tenant_id(payload); + v_rows jsonb; + v_consolidated jsonb := '[]'::jsonb; +BEGIN + IF v_global THEN + SELECT COALESCE(jsonb_agg(to_jsonb(x)), '[]'::jsonb) INTO v_rows FROM ( + SELECT + w.id AS warehouse_id, + w.kind, + w.project_id, + p.code AS project_code, + p.name AS project_name, + CASE WHEN w.kind = 'central' THEN 'Almacén global' + ELSE COALESCE(p.code || ' — ' || p.name, 'Obra') + END AS warehouse_label, + m.id AS material_id, + m.code AS material_code, + m.name AS material_name, + m.unit, + COALESCE(u.label, m.unit) AS unit_label, + s.qty_on_hand, + s.avg_unit_cost, + round(s.qty_on_hand * s.avg_unit_cost, 2) AS stock_value + FROM warehouse_stock s + JOIN warehouses w ON w.id = s.warehouse_id + JOIN warehouse_materials m ON m.id = s.material_id + LEFT JOIN measure_units u ON u.id = m.unit_id + LEFT JOIN projects p ON p.id = w.project_id + WHERE w.tenant_id = v_tid AND w.status = 'open' AND s.qty_on_hand > 0 + ) x; + SELECT COALESCE(jsonb_agg(to_jsonb(x)), '[]'::jsonb) INTO v_consolidated FROM ( + SELECT + m.id AS material_id, + m.code AS material_code, + m.name AS material_name, + m.unit, + COALESCE(u.label, m.unit) AS unit_label, + SUM(s.qty_on_hand) AS qty_on_hand, + CASE WHEN SUM(s.qty_on_hand) > 0 + THEN round(SUM(s.qty_on_hand * s.avg_unit_cost) / SUM(s.qty_on_hand), 4) + ELSE 0 + END AS avg_unit_cost, + round(SUM(s.qty_on_hand * s.avg_unit_cost), 2) AS stock_value, + COUNT(*) FILTER (WHERE s.qty_on_hand > 0)::integer AS warehouse_count + FROM warehouse_stock s + JOIN warehouses w ON w.id = s.warehouse_id + JOIN warehouse_materials m ON m.id = s.material_id + LEFT JOIN measure_units u ON u.id = m.unit_id + WHERE w.tenant_id = v_tid AND w.status = 'open' AND s.qty_on_hand > 0 + GROUP BY m.id, m.code, m.name, m.unit, u.label + ) x; + ELSE + IF v_warehouse_id IS NULL THEN + RETURN core.rpc_err('VALIDATION', 'fn_warehouse_stock_list: warehouse_id es obligatorio si global=false', + jsonb_build_object('fn', 'fn_warehouse_stock_list')); + END IF; + SELECT COALESCE(jsonb_agg(to_jsonb(x)), '[]'::jsonb) INTO v_rows FROM ( + SELECT + s.*, + m.code AS material_code, + m.name AS material_name, + m.unit, + COALESCE(u.label, m.unit) AS unit_label, + CASE WHEN w.kind = 'central' THEN 'Almacén global' + ELSE COALESCE(p.code || ' — ' || p.name, 'Obra') + END AS warehouse_label, + w.kind, + w.project_id, + p.code AS project_code, + round(s.qty_on_hand * s.avg_unit_cost, 2) AS stock_value + FROM warehouse_stock s + JOIN warehouses w ON w.id = s.warehouse_id + JOIN warehouse_materials m ON m.id = s.material_id + LEFT JOIN measure_units u ON u.id = m.unit_id + LEFT JOIN projects p ON p.id = w.project_id + WHERE s.warehouse_id = v_warehouse_id AND s.qty_on_hand > 0 + ) x; + END IF; + RETURN core.rpc_ok( + jsonb_build_object('stock', COALESCE(v_rows, '[]'::jsonb), 'consolidated', v_consolidated), + format('Stock consultado: %s línea(s)', jsonb_array_length(COALESCE(v_rows, '[]'::jsonb))), + jsonb_build_object('fn', 'fn_warehouse_stock_list', 'warehouse_id', v_warehouse_id) + ); +EXCEPTION WHEN OTHERS THEN + RETURN core.rpc_from_exception('fn_warehouse_stock_list', SQLSTATE, SQLERRM); +END; +$$; + +--changeset panel:core-035g-fn-warehouse-transfer-create splitStatements:false +CREATE OR REPLACE FUNCTION core.fn_warehouse_transfer_create(payload jsonb) +RETURNS jsonb +LANGUAGE plpgsql +SECURITY INVOKER +SET search_path = core +AS $$ +DECLARE + v_tid integer := core._cost_tenant_id(payload); + v_from_id bigint := NULLIF(payload->>'from_warehouse_id', '')::bigint; + v_to_id bigint := NULLIF(payload->>'to_warehouse_id', '')::bigint; + v_material_id bigint := NULLIF(payload->>'material_id', '')::bigint; + v_qty numeric := COALESCE((payload->>'quantity')::numeric, 0); + v_transfer_date date := COALESCE(NULLIF(payload->>'transfer_date', '')::date, CURRENT_DATE); + v_notes text := coalesce(nullif(btrim(payload->>'notes'), ''), ''); + v_from record; + v_to record; + v_stock record; + v_unit_cost numeric; + v_transfer_id bigint; + v_created_by text := coalesce(nullif(btrim(payload->>'created_by_name'), ''), ''); +BEGIN + IF v_from_id IS NULL OR v_to_id IS NULL OR v_material_id IS NULL OR v_qty <= 0 OR v_from_id = v_to_id THEN + RETURN core.rpc_err('VALIDATION', 'fn_warehouse_transfer_create: origen, destino, material y cantidad válidos son obligatorios', + jsonb_build_object('fn', 'fn_warehouse_transfer_create')); + END IF; + SELECT * INTO v_from FROM warehouses WHERE id = v_from_id AND tenant_id = v_tid; + IF NOT FOUND OR v_from.status <> 'open' THEN + RETURN core.rpc_err('VALIDATION', 'fn_warehouse_transfer_create: el almacén origen no está abierto', + jsonb_build_object('fn', 'fn_warehouse_transfer_create', 'from_warehouse_id', v_from_id)); + END IF; + SELECT * INTO v_to FROM warehouses WHERE id = v_to_id AND tenant_id = v_tid; + IF NOT FOUND OR v_to.status <> 'open' THEN + RETURN core.rpc_err('VALIDATION', 'fn_warehouse_transfer_create: el almacén destino no está abierto', + jsonb_build_object('fn', 'fn_warehouse_transfer_create', 'to_warehouse_id', v_to_id)); + END IF; + SELECT * INTO v_stock FROM warehouse_stock WHERE warehouse_id = v_from_id AND material_id = v_material_id; + IF NOT FOUND OR v_stock.qty_on_hand < v_qty THEN + RETURN core.rpc_err('VALIDATION', 'fn_warehouse_transfer_create: stock insuficiente en almacén origen', + jsonb_build_object('fn', 'fn_warehouse_transfer_create', 'from_warehouse_id', v_from_id)); + END IF; + v_unit_cost := v_stock.avg_unit_cost; + INSERT INTO warehouse_transfers ( + tenant_id, from_warehouse_id, to_warehouse_id, material_id, quantity, unit_cost, + status, transfer_date, notes, created_by_name + ) VALUES ( + v_tid, v_from_id, v_to_id, v_material_id, v_qty, v_unit_cost, + 'completed', v_transfer_date, v_notes, v_created_by + ) RETURNING id INTO v_transfer_id; + PERFORM core._warehouse_stock_apply(v_from_id, v_material_id, -v_qty, v_unit_cost); + PERFORM core._warehouse_stock_apply(v_to_id, v_material_id, v_qty, v_unit_cost); + INSERT INTO warehouse_movements (tenant_id, warehouse_id, material_id, movement_type, transfer_id, movement_date, quantity, unit_cost, total_cost, created_by_name) + VALUES (v_tid, v_from_id, v_material_id, 'transfer_out', v_transfer_id, v_transfer_date, v_qty, v_unit_cost, round(v_qty*v_unit_cost,2), v_created_by); + INSERT INTO warehouse_movements (tenant_id, warehouse_id, material_id, movement_type, transfer_id, movement_date, quantity, unit_cost, total_cost, created_by_name) + VALUES (v_tid, v_to_id, v_material_id, 'transfer_in', v_transfer_id, v_transfer_date, v_qty, v_unit_cost, round(v_qty*v_unit_cost,2), v_created_by); + RETURN core.rpc_created( + jsonb_build_object('transfer_id', v_transfer_id, 'quantity', v_qty, 'unit_cost', v_unit_cost), + format('Transferencia %s unidades del almacén %s al %s', v_qty, v_from_id, v_to_id), + jsonb_build_object('fn', 'fn_warehouse_transfer_create', 'transfer_id', v_transfer_id)); +EXCEPTION WHEN OTHERS THEN + RETURN core.rpc_from_exception('fn_warehouse_transfer_create', SQLSTATE, SQLERRM); +END; +$$; + +--changeset panel:core-035h-fn-warehouse-movement-list splitStatements:false +CREATE OR REPLACE FUNCTION core.fn_warehouse_movement_list(payload jsonb) +RETURNS jsonb +LANGUAGE plpgsql +SECURITY INVOKER +SET search_path = core +AS $$ +DECLARE + v_tid integer := core._cost_tenant_id(payload); + v_warehouse_id bigint := NULLIF(payload->>'warehouse_id', '')::bigint; + v_material_id bigint := NULLIF(payload->>'material_id', '')::bigint; + v_global boolean := COALESCE((payload->>'global')::boolean, false); + v_rows jsonb; +BEGIN + SELECT COALESCE(jsonb_agg(to_jsonb(x) ORDER BY x.movement_date DESC, x.id DESC), '[]'::jsonb) INTO v_rows + FROM ( + SELECT + m.*, + mat.code AS material_code, + mat.name AS material_name, + bi.description AS budget_item_description, + CASE WHEN w.kind = 'central' THEN 'Almacén global' + ELSE COALESCE(p.code || ' — ' || p.name, 'Obra') + END AS warehouse_label + FROM warehouse_movements m + JOIN warehouse_materials mat ON mat.id = m.material_id + JOIN warehouses w ON w.id = m.warehouse_id + LEFT JOIN projects p ON p.id = w.project_id + LEFT JOIN budget_items bi ON bi.id = m.budget_item_id + WHERE (v_tid <= 0 OR m.tenant_id = v_tid) + AND (v_warehouse_id IS NULL OR m.warehouse_id = v_warehouse_id) + AND (v_material_id IS NULL OR m.material_id = v_material_id) + ) x; + RETURN core.rpc_ok(jsonb_build_object('movements', v_rows), + format('Kardex: %s movimiento(s)', jsonb_array_length(v_rows)), + jsonb_build_object('fn', 'fn_warehouse_movement_list', 'warehouse_id', v_warehouse_id)); +EXCEPTION WHEN OTHERS THEN + RETURN core.rpc_from_exception('fn_warehouse_movement_list', SQLSTATE, SQLERRM); +END; +$$; + +--changeset panel:core-035i-fn-warehouse-close-project splitStatements:false +CREATE OR REPLACE FUNCTION core.fn_warehouse_close_project(payload jsonb) +RETURNS jsonb +LANGUAGE plpgsql +SECURITY INVOKER +SET search_path = core +AS $$ +DECLARE + v_project_id bigint := NULLIF(payload->>'project_id', '')::bigint; + v_force boolean := COALESCE((payload->>'force')::boolean, false); + v_transfer_remaining boolean := COALESCE((payload->>'transfer_remaining')::boolean, false); + v_closed_by text := coalesce(nullif(btrim(payload->>'closed_by_name'), ''), ''); + v_notes text := coalesce(nullif(btrim(payload->>'close_notes'), ''), ''); + v_wh record; + v_central_id bigint; + v_stock_count integer; + v_line record; + v_xfer jsonb; +BEGIN + IF v_project_id IS NULL THEN + RETURN core.rpc_err('VALIDATION', 'fn_warehouse_close_project: project_id es obligatorio', + jsonb_build_object('fn', 'fn_warehouse_close_project')); + END IF; + SELECT * INTO v_wh FROM warehouses WHERE project_id = v_project_id AND kind = 'project'; + IF NOT FOUND THEN + RETURN core.rpc_ok(jsonb_build_object('closed', false, 'reason', 'no_warehouse'), + format('Proyecto %s no tenía almacén abierto', v_project_id), + jsonb_build_object('fn', 'fn_warehouse_close_project', 'project_id', v_project_id)); + END IF; + IF v_wh.status = 'closed' THEN + RETURN core.rpc_ok(jsonb_build_object('warehouse_id', v_wh.id, 'status', 'closed'), + format('Almacén del proyecto %s ya estaba cerrado', v_project_id), + jsonb_build_object('fn', 'fn_warehouse_close_project', 'project_id', v_project_id)); + END IF; + IF v_transfer_remaining THEN + PERFORM core.fn_warehouse_ensure_central(jsonb_build_object('tenant_id', v_wh.tenant_id)); + SELECT id INTO v_central_id FROM warehouses WHERE tenant_id = v_wh.tenant_id AND kind = 'central' LIMIT 1; + IF v_central_id IS NOT NULL THEN + FOR v_line IN + SELECT material_id, qty_on_hand + FROM warehouse_stock + WHERE warehouse_id = v_wh.id AND qty_on_hand > 0 + LOOP + v_xfer := core.fn_warehouse_transfer_create(jsonb_build_object( + 'tenant_id', v_wh.tenant_id, + 'from_warehouse_id', v_wh.id, + 'to_warehouse_id', v_central_id, + 'material_id', v_line.material_id, + 'quantity', v_line.qty_on_hand, + 'notes', 'Traspaso automático al cerrar almacén de obra', + 'created_by_name', v_closed_by + )); + IF NOT COALESCE((v_xfer->>'ok')::boolean, false) THEN + RETURN v_xfer; + END IF; + END LOOP; + END IF; + END IF; + SELECT COUNT(*)::integer INTO v_stock_count FROM warehouse_stock + WHERE warehouse_id = v_wh.id AND qty_on_hand > 0; + IF v_stock_count > 0 AND NOT v_force THEN + RETURN core.rpc_err('VALIDATION', + format('fn_warehouse_close_project: quedan %s material(es) con stock; transfiera al almacén global o ajuste antes de cerrar', v_stock_count), + jsonb_build_object('fn', 'fn_warehouse_close_project', 'project_id', v_project_id, 'stock_lines', v_stock_count)); + END IF; + UPDATE warehouses SET status = 'closed', closed_at = now(), closed_by_name = v_closed_by, close_notes = v_notes + WHERE id = v_wh.id; + RETURN core.rpc_ok( + jsonb_build_object( + 'warehouse_id', v_wh.id, + 'status', 'closed', + 'forced', v_force, + 'transferred_remaining', v_transfer_remaining + ), + format('Almacén del proyecto %s cerrado', v_project_id), + jsonb_build_object('fn', 'fn_warehouse_close_project', 'project_id', v_project_id)); +EXCEPTION WHEN OTHERS THEN + RETURN core.rpc_from_exception('fn_warehouse_close_project', SQLSTATE, SQLERRM); +END; +$$; + +--changeset panel:core-035j-grants endDelimiter:; splitStatements:true +GRANT EXECUTE ON FUNCTION core.fn_warehouse_material_list(jsonb) TO panels_core_app; +GRANT EXECUTE ON FUNCTION core.fn_warehouse_material_upsert(jsonb) TO panels_core_app; +GRANT EXECUTE ON FUNCTION core.fn_warehouse_stock_list(jsonb) TO panels_core_app; +GRANT EXECUTE ON FUNCTION core.fn_warehouse_transfer_create(jsonb) TO panels_core_app; +GRANT EXECUTE ON FUNCTION core.fn_warehouse_movement_list(jsonb) TO panels_core_app; +GRANT EXECUTE ON FUNCTION core.fn_warehouse_close_project(jsonb) TO panels_core_app; diff --git a/web-panel/assets/css/desktop-v2.css b/web-panel/assets/css/desktop-v2.css index 44ee5e9..aec53a5 100644 --- a/web-panel/assets/css/desktop-v2.css +++ b/web-panel/assets/css/desktop-v2.css @@ -1844,7 +1844,8 @@ html.dark .p-tieredmenu, html.dark .p-popover, html.dark .p-datepicker, html.dark .p-select-overlay, -html.dark .p-multiselect-overlay { +html.dark .p-multiselect-overlay, +html.dark .p-autocomplete-overlay { --p-content-background: #111b2e; } @@ -2165,7 +2166,8 @@ html.dark .p-select-label.p-placeholder { html.dark .p-select-overlay, html.dark .p-datepicker-panel, -html.dark .p-multiselect-overlay { +html.dark .p-multiselect-overlay, +html.dark .p-autocomplete-overlay { background: #111b2e !important; border-color: #243044 !important; color: #e2e8f0 !important; @@ -2237,6 +2239,58 @@ html.dark .p-dialog .p-dialog-header-icon { .cost-critical { background: #ffebee !important; color: #b42318 !important; } .cost-critical-text { color: #b42318; font-weight: 600; } +.budget-item-picker-overlay.p-select-overlay, +.budget-item-picker-overlay.p-autocomplete-overlay, +.budget-item-picker-overlay { + overflow-x: hidden; + box-sizing: border-box; +} +.budget-item-picker-overlay .p-select-list, +.budget-item-picker-overlay .p-autocomplete-list, +.budget-item-picker-overlay ul { + width: 100%; + margin: 0; + padding: 4px 0; + list-style: none; +} +.budget-item-picker-overlay .p-select-option, +.budget-item-picker-overlay .p-autocomplete-option, +.budget-item-picker-overlay li { + white-space: normal; + overflow-wrap: anywhere; + align-items: flex-start; +} +.budget-item-picker .budget-item-value { + display: flex; + align-items: baseline; + gap: 8px; + min-width: 0; + max-width: 100%; +} +.budget-item-picker .budget-item-value-desc { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + color: #5b6573; +} +.budget-item-option { + display: flex; + flex-direction: column; + gap: 2px; + min-width: 0; + max-width: 100%; +} +.budget-item-option-desc { + color: #5b6573; + font-size: 12px; + line-height: 1.35; + overflow-wrap: anywhere; +} +html.dark .budget-item-option-desc, +html.dark .budget-item-picker .budget-item-value-desc { + color: #94a3b8; +} + /* Grouped menubar: single row, icons, card-style submenus. */ .menubar.p-menubar { display: flex; diff --git a/web-panel/components/BudgetItemPicker.vue b/web-panel/components/BudgetItemPicker.vue index 2c0f777..08a1fdc 100644 --- a/web-panel/components/BudgetItemPicker.vue +++ b/web-panel/components/BudgetItemPicker.vue @@ -1,14 +1,35 @@ diff --git a/web-panel/components/MaterialCatalogDialog.vue b/web-panel/components/MaterialCatalogDialog.vue new file mode 100644 index 0000000..68562b1 --- /dev/null +++ b/web-panel/components/MaterialCatalogDialog.vue @@ -0,0 +1,269 @@ + + + diff --git a/web-panel/components/SupplierFormDialog.vue b/web-panel/components/SupplierFormDialog.vue new file mode 100644 index 0000000..2710079 --- /dev/null +++ b/web-panel/components/SupplierFormDialog.vue @@ -0,0 +1,129 @@ +