forlogic-core 2.5.0 → 2.5.2

package/docs/sql/import/validate_occurrences.sql

@@ -0,0 +1,295 @@
+use [qualiex_common]
+go
+
+IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[import].[occurrences_staging]') AND type IN (N'U'))
+    DROP TABLE [import].[occurrences_staging]
+GO
+
+CREATE TABLE import.occurrences_staging
+(
+    id_batch            UNIQUEIDENTIFIER,
+    row_num             INT NOT NULL,
+    code                NVARCHAR(8) COLLATE Latin1_General_CS_AS NOT NULL,
+    name                NVARCHAR(500) COLLATE Latin1_General_CS_AS NULL,
+    id_type             CHAR(8) COLLATE Latin1_General_CS_AS NULL,
+    id_category         CHAR(8) COLLATE Latin1_General_CS_AS NULL,
+    description         NVARCHAR(MAX) COLLATE Latin1_General_CS_AS NULL,
+    id_creation_user    CHAR(8) COLLATE Latin1_General_CS_AS NULL,
+    id_responsible      CHAR(8) COLLATE Latin1_General_CS_AS NULL,
+    start_date          DATETIMEOFFSET(7) NULL,
+    end_date            DATETIMEOFFSET(7) NULL,
+    id_status           INT NOT NULL,
+    id_company          CHAR(8) COLLATE Latin1_General_CS_AS NOT NULL,
+    CONSTRAINT pk_occurrences_staging PRIMARY KEY CLUSTERED (id_batch, row_num)
+)
+GO
+
+USE [qualiex_common]
+GO
+
+CREATE OR ALTER PROCEDURE import.validate_occurrences
+    @id_batch UNIQUEIDENTIFIER
+AS
+BEGIN
+    SET NOCOUNT ON;
+
+    -- VALIDAÇÃO 1: Duplicado dentro do próprio lote
+    INSERT INTO import.errors
+        (id_batch, row_num, error_msg)
+    SELECT @id_batch, sub.row_num, 'Código duplicado no arquivo'
+    FROM (
+        SELECT *, COUNT(*) OVER (PARTITION BY code) AS cnt
+        FROM import.occurrences_staging WITH (NOLOCK)
+        WHERE id_batch = @id_batch
+    ) sub
+    WHERE sub.cnt > 1;
+
+    -- VALIDAÇÃO 2: Código já existente na produção
+    INSERT INTO import.errors
+        (id_batch, row_num, error_msg)
+    SELECT @id_batch, os.row_num, 'Código já existe na base'
+    FROM import.occurrences_staging os WITH (NOLOCK)
+    INNER JOIN occurrences.occurrences o WITH (NOLOCK) 
+        ON o.code COLLATE Latin1_General_CS_AS = os.code 
+       AND o.id_company COLLATE Latin1_General_CS_AS = os.id_company
+       AND o.removed = 0
+    WHERE os.id_batch = @id_batch;
+
+    -- INSERÇÃO: Apenas registros válidos
+    INSERT INTO occurrences.occurrences
+        (
+        code,
+        name,
+        id_type,
+        id_category,
+        description,
+        id_creation_user,
+        id_responsible,
+        start_date,
+        end_date,
+        id_status,
+        id_company,
+        root_cause_identification_required,
+        checker_responsible_equals_in_occurrences,
+        creation_date,
+        last_modified,
+        removed
+        )
+    SELECT
+        os.code,
+        os.name,
+        os.id_type,
+        os.id_category,
+        os.description,
+        os.id_creation_user,
+        os.id_responsible,
+        os.start_date,
+        os.end_date,
+        os.id_status,
+        os.id_company,
+        1,
+        0,
+        SYSDATETIMEOFFSET(),
+        SYSDATETIMEOFFSET(),
+        0
+    FROM import.occurrences_staging os WITH (NOLOCK)
+    WHERE os.id_batch = @id_batch
+      AND NOT EXISTS (
+          SELECT 1
+          FROM import.errors e
+          WHERE e.id_batch = os.id_batch
+            AND e.row_num = os.row_num
+      );
+
+    CREATE TABLE #occurrence_phases (
+        id UNIQUEIDENTIFIER,
+        id_company CHAR(8),
+        id_occurrence CHAR(8),
+        id_responsible CHAR(8),
+        start_date DATETIME2,
+        id_days_work INT,
+        days_evaluation INT,
+        days_causes_analysis INT,
+        days_action_plan_elaboration INT,
+        days_action_plan_execution INT,
+        days_effectiveness_check INT,
+        days_standardization INT
+    );
+ 
+    INSERT INTO #occurrence_phases (
+        id,
+        id_company,
+        id_occurrence,
+        id_responsible,
+        start_date,
+        id_days_work,
+        days_evaluation,
+        days_causes_analysis,
+        days_action_plan_elaboration,
+        days_action_plan_execution,
+        days_effectiveness_check,
+        days_standardization
+    )
+    SELECT
+        NEWID() AS id,
+        o.id_company,
+        o.id AS id_occurrence,
+        o.id_responsible,
+        COALESCE(o.start_date, o.creation_date) AS start_date,
+        c.id_days_work,
+        cat.days_evaluation,
+        cat.days_causes_analysis,
+        cat.days_action_plan_elaboration,
+        cat.days_action_plan_execution,
+        cat.days_effectiveness_check,
+        cat.days_standardization
+    FROM import.occurrences_staging os WITH (NOLOCK)
+    INNER JOIN occurrences.occurrences o WITH (NOLOCK) 
+        ON o.id_company COLLATE Latin1_General_CS_AS = os.id_company 
+       AND o.code COLLATE Latin1_General_CS_AS = os.code 
+       AND o.removed = 0
+    INNER JOIN occurrences.configurations c WITH (NOLOCK) 
+        ON c.id_company = o.id_company
+    INNER JOIN occurrences.categories cat WITH (NOLOCK) 
+        ON cat.id = o.id_category
+    WHERE os.id_batch = @id_batch
+      AND o.id_category IS NOT NULL;
+ 
+    -- create a record table that will hold one row per phase, calculated sequentially
+    CREATE TABLE #phase_records (
+        id_company CHAR(8),
+        id_occurrence CHAR(8),
+        id_responsible CHAR(8),
+        phase_status INT,
+        phase_duration INT,
+        phase_end_date DATETIME2
+    );
+ 
+    -- evaluation
+    INSERT INTO #phase_records
+    SELECT
+        id_company,
+        id_occurrence,
+        id_responsible,
+        2,
+        days_evaluation,
+        dbo.AddDays(days_evaluation, start_date, id_days_work, 0)
+    FROM #occurrence_phases;
+ 
+    -- cause analysis (cumulative)
+    INSERT INTO #phase_records
+    SELECT
+        id_company,
+        id_occurrence,
+        id_responsible,
+        3,
+        days_causes_analysis,
+        dbo.AddDays(days_evaluation + days_causes_analysis, start_date, id_days_work, 0)
+    FROM #occurrence_phases;
+ 
+    -- action plan elaboration (cumulative)
+    INSERT INTO #phase_records
+    SELECT
+        id_company,
+        id_occurrence,
+        id_responsible,
+        4,
+        days_action_plan_elaboration,
+        dbo.AddDays(days_evaluation + days_causes_analysis + days_action_plan_elaboration, start_date, id_days_work, 0)
+    FROM #occurrence_phases;
+ 
+    -- action plan execution (cumulative)
+    INSERT INTO #phase_records
+    SELECT
+        id_company,
+        id_occurrence,
+        id_responsible,
+        5,
+        days_action_plan_execution,
+        dbo.AddDays(days_evaluation + days_causes_analysis + days_action_plan_elaboration + days_action_plan_execution, start_date, id_days_work, 0)
+    FROM #occurrence_phases;
+ 
+    -- effectiveness check (cumulative)
+    INSERT INTO #phase_records
+    SELECT
+        id_company,
+        id_occurrence,
+        id_responsible,
+        6,
+        days_effectiveness_check,
+        dbo.AddDays(days_evaluation + days_causes_analysis + days_action_plan_elaboration + days_action_plan_execution + days_effectiveness_check, start_date, id_days_work, 0)
+    FROM #occurrence_phases;
+ 
+    -- standardization (cumulative)
+    INSERT INTO #phase_records
+    SELECT
+        id_company,
+        id_occurrence,
+        id_responsible,
+        7,
+        days_standardization,
+        dbo.AddDays(days_evaluation + days_causes_analysis + days_action_plan_elaboration + days_action_plan_execution + days_effectiveness_check + days_standardization, start_date, id_days_work, 0)
+    FROM #occurrence_phases;
+ 
+    -- finally insert all records into production at once
+    INSERT INTO occurrences.phase_associations
+        (id_company, id_occurrence, id_responsible, id_status, duration_days, end_date)
+    SELECT
+        id_company,
+        id_occurrence,
+        id_responsible,
+        phase_status,
+        phase_duration,
+        phase_end_date
+    FROM #phase_records;
+ 
+    DROP TABLE #occurrence_phases;
+    DROP TABLE #phase_records;
+
+END
+GO
+
+use [qualiex_common]
+go
+
+CREATE OR ALTER PROCEDURE import.get_errors_occurrences
+(
+    @id_batch UNIQUEIDENTIFIER
+)
+AS
+BEGIN
+    SET NOCOUNT ON;
+
+    SELECT
+        STRING_AGG(CAST(e.error_msg AS NVARCHAR(MAX)), '; ') WITHIN GROUP (ORDER BY e.error_msg) AS error_msg,
+        e.row_num,
+        os.code,
+        os.name,
+        os.id_type,
+        os.id_category,
+        os.description,
+        os.id_creation_user,
+        os.id_responsible,
+        os.start_date,
+        os.end_date,
+        os.id_status
+    FROM import.errors e WITH (NOLOCK)
+    JOIN import.occurrences_staging os WITH (NOLOCK)
+        ON os.row_num = e.row_num
+       AND os.id_batch = e.id_batch
+    WHERE e.id_batch = @id_batch
+    GROUP BY
+        e.row_num,
+        os.code,
+        os.name,
+        os.id_type,
+        os.id_category,
+        os.description,
+        os.id_creation_user,
+        os.id_responsible,
+        os.start_date,
+        os.end_date,
+        os.id_status
+    ORDER BY e.row_num;
+END
+GO

package/docs/sql/import/validate_occurrences_categories.sql

@@ -1,8 +1,6 @@
 USE [qualiex_common]
 GO
 
-begin tran
-
 IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[import].[occurrences_categories_staging]') AND type IN (N'U'))
     DROP TABLE [import].[occurrences_categories_staging]
 GO
@@ -10,25 +8,30 @@ GO
 CREATE TABLE [import].[occurrences_categories_staging](
     [id_batch]                       [uniqueidentifier] NOT NULL,
     [row_num]                        [int]              NOT NULL,
-    [name]                           [nvarchar](150)    NOT NULL,
-    [description]                    [nvarchar](1000)   NULL,
-    [is_active]                      [varchar](20)      NULL,
+    [name]                           [nvarchar](150)    COLLATE Latin1_General_CS_AS NOT NULL,
+    [description]                    [nvarchar](1000)   COLLATE Latin1_General_CS_AS NULL,
+    [is_active]                      [varchar](20)      COLLATE Latin1_General_CS_AS NULL,
     [id_method]                      [int]              NOT NULL,
-    [icon]                           [varchar](30)      NULL,
-    [days_causes_analysis]           [varchar](10)      NULL,
-    [days_action_plan_elaboration]   [varchar](10)      NULL,
-    [days_action_plan_execution]     [varchar](10)      NULL,
-    [days_effectiveness_check]       [varchar](10)      NULL,
-    [days_standardization]           [varchar](10)      NULL,
-    [days_evaluation]                [varchar](10)      NULL,
-    [active_cause_analysis]          [varchar](10)      NULL,
-    [active_effectiveness_check]     [varchar](10)      NULL,
-    [active_standardization]         [varchar](10)      NULL,
-    [aprove_evaluation]              [varchar](10)      NULL,
-    [all_types_associated]           [varchar](10)      NULL,
-    [id_rule_prioritization]         [char](8)          NULL,
-    [id_company]                     [char](8)          NOT NULL,
- CONSTRAINT [pk_occurrences_categories_staging] PRIMARY KEY CLUSTERED
+    [icon]                           [varchar](30)      COLLATE Latin1_General_CS_AS NULL,
+    [days_causes_analysis]           [varchar](10)      COLLATE Latin1_General_CS_AS NULL,
+    [days_action_plan_elaboration]   [varchar](10)      COLLATE Latin1_General_CS_AS NULL,
+    [days_action_plan_execution]     [varchar](10)      COLLATE Latin1_General_CS_AS NULL,
+    [days_effectiveness_check]       [varchar](10)      COLLATE Latin1_General_CS_AS NULL,
+    [days_standardization]           [varchar](10)      COLLATE Latin1_General_CS_AS NULL,
+    [days_evaluation]                [varchar](10)      COLLATE Latin1_General_CS_AS NULL,
+    [active_cause_analysis]          [varchar](10)      COLLATE Latin1_General_CS_AS NULL,
+    [active_effectiveness_check]     [varchar](10)      COLLATE Latin1_General_CS_AS NULL,
+    [active_standardization]         [varchar](10)      COLLATE Latin1_General_CS_AS NULL,
+    [aprove_cause_analysis]          [varchar](10)      COLLATE Latin1_General_CS_AS NULL,
+    [aprove_action_plan_elaboration] [varchar](10)      COLLATE Latin1_General_CS_AS NULL,
+    [aprove_action_plan_execution]   [varchar](10)      COLLATE Latin1_General_CS_AS NULL,
+    [aprove_effectiveness_check]     [varchar](10)      COLLATE Latin1_General_CS_AS NULL,
+    [aprove_standardization]         [varchar](10)      COLLATE Latin1_General_CS_AS NULL,
+    [aprove_evaluation]              [varchar](10)      COLLATE Latin1_General_CS_AS NULL,
+    [all_types_associated]           [varchar](10)      COLLATE Latin1_General_CS_AS NULL,
+    [id_rule_prioritization]         [char](8)          COLLATE Latin1_General_CS_AS NULL,
+    [id_company]                     [char](8)          COLLATE Latin1_General_CS_AS NOT NULL,
+ CONSTRAINT [pk_occurrences_categories_staging] PRIMARY KEY CLUSTERED 
 (
     [id_batch] ASC,
     [row_num]  ASC
@@ -36,6 +39,9 @@ CREATE TABLE [import].[occurrences_categories_staging](
 ) ON [PRIMARY]
 GO
 
+USE [qualiex_common]
+GO
+
 CREATE OR ALTER PROCEDURE [import].[validate_occurrences_categories]
     @id_batch UNIQUEIDENTIFIER
 AS
@@ -44,93 +50,100 @@ BEGIN
 
     -- Validação 1: Nome duplicado no arquivo
     INSERT INTO import.errors (id_batch, row_num, error_msg)
-    SELECT @id_batch, s.row_num, 'Nome duplicado no arquivo'
+    SELECT @id_batch, sub.row_num, 'Nome duplicado no arquivo'
     FROM (
         SELECT *, COUNT(*) OVER (PARTITION BY name) AS cnt
         FROM import.occurrences_categories_staging WITH (NOLOCK)
         WHERE id_batch = @id_batch
-    ) s
-    WHERE s.cnt > 1;
+    ) sub
+    WHERE sub.cnt > 1;
 
     -- Validação 2: Nome já existente na produção
+    -- Correção: Collate explícito para resolver o conflito
     INSERT INTO import.errors (id_batch, row_num, error_msg)
-    SELECT @id_batch, s.row_num, 'Categoria de ocorrência já existe na base para esta unidade'
-    FROM import.occurrences_categories_staging s WITH (NOLOCK)
-    INNER JOIN occurrences.categories t WITH (NOLOCK)
-        ON t.name = s.name COLLATE Latin1_General_CS_AS
-       AND t.removed = 0
-       AND t.id_company = s.id_company COLLATE Latin1_General_CS_AS
-    WHERE s.id_batch = @id_batch;
+    SELECT @id_batch, ocs.row_num, 'Categoria de ocorrência já existe na base para esta unidade'
+    FROM import.occurrences_categories_staging ocs WITH (NOLOCK)
+    INNER JOIN occurrences.categories oc WITH (NOLOCK)
+        ON oc.name COLLATE Latin1_General_CS_AS = ocs.name 
+       AND oc.id_company COLLATE Latin1_General_CS_AS = ocs.id_company 
+       AND oc.removed = 0
+    WHERE ocs.id_batch = @id_batch;
 
     -- Validação 3: Situação (is_active) inválida
     INSERT INTO import.errors (id_batch, row_num, error_msg)
-    SELECT @id_batch, s.row_num, 'Situação inválida (selecione Ativo ou Inativo na planilha)'
-    FROM import.occurrences_categories_staging s WITH (NOLOCK)
-    WHERE s.id_batch = @id_batch
-      AND ISNULL(s.is_active, '') COLLATE Latin1_General_CS_AS NOT IN ('Ativo', 'Inativo');
+    SELECT @id_batch, ocs.row_num, 'Situação inválida (selecione Ativo ou Inativo na planilha)'
+    FROM import.occurrences_categories_staging ocs WITH (NOLOCK)
+    WHERE ocs.id_batch = @id_batch
+      AND ISNULL(ocs.is_active, '') NOT IN ('Ativo', 'Inativo');
 
     -- Validação 4: Booleanos inválidos (Sim / Não)
     INSERT INTO import.errors (id_batch, row_num, error_msg)
-    SELECT @id_batch, s.row_num, 'Valor inválido para campos de Sim/Não (Certifique-se de escolher Sim ou Não na planilha)'
-    FROM import.occurrences_categories_staging s WITH (NOLOCK)
-    WHERE s.id_batch = @id_batch
+    SELECT @id_batch, ocs.row_num, 'Valor inválido para campos de Sim/Não (Certifique-se de escolher Sim ou Não na planilha)'
+    FROM import.occurrences_categories_staging ocs WITH (NOLOCK)
+    WHERE ocs.id_batch = @id_batch
       AND (
-             (s.active_cause_analysis IS NOT NULL AND s.active_cause_analysis COLLATE Latin1_General_CS_AS NOT IN ('Sim','Não'))
-          OR (s.active_effectiveness_check IS NOT NULL AND s.active_effectiveness_check COLLATE Latin1_General_CS_AS NOT IN ('Sim','Não'))
-          OR (s.active_standardization IS NOT NULL AND s.active_standardization COLLATE Latin1_General_CS_AS NOT IN ('Sim','Não'))
-          OR (s.aprove_evaluation IS NOT NULL AND s.aprove_evaluation COLLATE Latin1_General_CS_AS NOT IN ('Sim','Não'))
-          OR (s.all_types_associated IS NOT NULL AND s.all_types_associated COLLATE Latin1_General_CS_AS NOT IN ('Sim','Não'))
+             (ocs.active_cause_analysis IS NOT NULL AND ocs.active_cause_analysis NOT IN ('Sim','Não'))
+          OR (ocs.active_effectiveness_check IS NOT NULL AND ocs.active_effectiveness_check NOT IN ('Sim','Não'))
+          OR (ocs.active_standardization IS NOT NULL AND ocs.active_standardization NOT IN ('Sim','Não'))
+          OR (ocs.aprove_cause_analysis IS NOT NULL AND ocs.aprove_cause_analysis NOT IN ('Sim','Não'))
+          OR (ocs.aprove_action_plan_elaboration IS NOT NULL AND ocs.aprove_action_plan_elaboration NOT IN ('Sim','Não'))
+          OR (ocs.aprove_action_plan_execution IS NOT NULL AND ocs.aprove_action_plan_execution NOT IN ('Sim','Não'))
+          OR (ocs.aprove_effectiveness_check IS NOT NULL AND ocs.aprove_effectiveness_check NOT IN ('Sim','Não'))
+          OR (ocs.aprove_standardization IS NOT NULL AND ocs.aprove_standardization NOT IN ('Sim','Não'))
+          OR (ocs.aprove_evaluation IS NOT NULL AND ocs.aprove_evaluation NOT IN ('Sim','Não'))
+          OR (ocs.all_types_associated IS NOT NULL AND ocs.all_types_associated NOT IN ('Sim','Não'))
       );
 
     -- Validação 5: Prazos (Dias) devem ser numéricos
     INSERT INTO import.errors (id_batch, row_num, error_msg)
-    SELECT @id_batch, s.row_num, 'Os valores de prazos/dias devem ser números inteiros'
-    FROM import.occurrences_categories_staging s WITH (NOLOCK)
-    WHERE s.id_batch = @id_batch
+    SELECT @id_batch, ocs.row_num, 'Os valores de prazos/dias devem ser números inteiros'
+    FROM import.occurrences_categories_staging ocs WITH (NOLOCK)
+    WHERE ocs.id_batch = @id_batch
       AND (
-             (s.days_causes_analysis IS NOT NULL AND TRY_CAST(s.days_causes_analysis AS INT) IS NULL)
-          OR (s.days_action_plan_elaboration IS NOT NULL AND TRY_CAST(s.days_action_plan_elaboration AS INT) IS NULL)
-          OR (s.days_action_plan_execution IS NOT NULL AND TRY_CAST(s.days_action_plan_execution AS INT) IS NULL)
-          OR (s.days_effectiveness_check IS NOT NULL AND TRY_CAST(s.days_effectiveness_check AS INT) IS NULL)
-          OR (s.days_standardization IS NOT NULL AND TRY_CAST(s.days_standardization AS INT) IS NULL)
-          OR (s.days_evaluation IS NOT NULL AND TRY_CAST(s.days_evaluation AS INT) IS NULL)
+             (ocs.days_causes_analysis IS NOT NULL AND TRY_CAST(ocs.days_causes_analysis AS INT) IS NULL)
+          OR (ocs.days_action_plan_elaboration IS NOT NULL AND TRY_CAST(ocs.days_action_plan_elaboration AS INT) IS NULL)
+          OR (ocs.days_action_plan_execution IS NOT NULL AND TRY_CAST(ocs.days_action_plan_execution AS INT) IS NULL)
+          OR (ocs.days_effectiveness_check IS NOT NULL AND TRY_CAST(ocs.days_effectiveness_check AS INT) IS NULL)
+          OR (ocs.days_standardization IS NOT NULL AND TRY_CAST(ocs.days_standardization AS INT) IS NULL)
+          OR (ocs.days_evaluation IS NOT NULL AND TRY_CAST(ocs.days_evaluation AS INT) IS NULL)
       );
 
     -- Validação 6: Prazo da Análise de causa é obrigatório quando a etapa está ativa
     INSERT INTO import.errors (id_batch, row_num, error_msg)
-    SELECT @id_batch, s.row_num, 'Prazo de Análise de causa é obrigatório quando a etapa está ativa'
-    FROM import.occurrences_categories_staging s WITH (NOLOCK)
-    WHERE s.id_batch = @id_batch
-      AND s.active_cause_analysis COLLATE Latin1_General_CS_AS = 'Sim'
-      AND (s.days_causes_analysis IS NULL OR LTRIM(RTRIM(s.days_causes_analysis)) = '');
+    SELECT @id_batch, ocs.row_num, 'Prazo de Análise de causa é obrigatório quando a etapa está ativa'
+    FROM import.occurrences_categories_staging ocs WITH (NOLOCK)
+    WHERE ocs.id_batch = @id_batch
+      AND ocs.active_cause_analysis = 'Sim'
+      AND (ocs.days_causes_analysis IS NULL OR LTRIM(RTRIM(ocs.days_causes_analysis)) = '');
 
     -- Validação 7: Prazo da Verificação de eficácia é obrigatório quando a etapa está ativa
     INSERT INTO import.errors (id_batch, row_num, error_msg)
-    SELECT @id_batch, s.row_num, 'Prazo de Verificação de eficácia é obrigatório quando a etapa está ativa'
-    FROM import.occurrences_categories_staging s WITH (NOLOCK)
-    WHERE s.id_batch = @id_batch
-      AND s.active_effectiveness_check COLLATE Latin1_General_CS_AS = 'Sim'
-      AND (s.days_effectiveness_check IS NULL OR LTRIM(RTRIM(s.days_effectiveness_check)) = '');
+    SELECT @id_batch, ocs.row_num, 'Prazo de Verificação de eficácia é obrigatório quando a etapa está ativa'
+    FROM import.occurrences_categories_staging ocs WITH (NOLOCK)
+    WHERE ocs.id_batch = @id_batch
+      AND ocs.active_effectiveness_check = 'Sim'
+      AND (ocs.days_effectiveness_check IS NULL OR LTRIM(RTRIM(ocs.days_effectiveness_check)) = '');
 
     -- Validação 8: Prazo da Padronização/Divulgação é obrigatório quando a etapa está ativa
     INSERT INTO import.errors (id_batch, row_num, error_msg)
-    SELECT @id_batch, s.row_num, 'Prazo de Padronização/Divulgação é obrigatório quando a etapa está ativa'
-    FROM import.occurrences_categories_staging s WITH (NOLOCK)
-    WHERE s.id_batch = @id_batch
-      AND s.active_standardization COLLATE Latin1_General_CS_AS = 'Sim'
-      AND (s.days_standardization IS NULL OR LTRIM(RTRIM(s.days_standardization)) = '');
+    SELECT @id_batch, ocs.row_num, 'Prazo de Padronização/Divulgação é obrigatório quando a etapa está ativa'
+    FROM import.occurrences_categories_staging ocs WITH (NOLOCK)
+    WHERE ocs.id_batch = @id_batch
+      AND ocs.active_standardization = 'Sim'
+      AND (ocs.days_standardization IS NULL OR LTRIM(RTRIM(ocs.days_standardization)) = '');
 
     -- Validação 9: Regra de priorização informada deve existir
     INSERT INTO import.errors (id_batch, row_num, error_msg)
-    SELECT @id_batch, s.row_num, 'Regra de priorização não encontrada'
-    FROM import.occurrences_categories_staging s WITH (NOLOCK)
-    WHERE s.id_batch = @id_batch
-      AND s.id_rule_prioritization IS NOT NULL
-      AND LTRIM(RTRIM(s.id_rule_prioritization)) <> ''
+    SELECT @id_batch, ocs.row_num, 'Regra de priorização não encontrada'
+    FROM import.occurrences_categories_staging ocs WITH (NOLOCK)
+    WHERE ocs.id_batch = @id_batch
+      AND ocs.id_rule_prioritization IS NOT NULL
+      AND LTRIM(RTRIM(ocs.id_rule_prioritization)) <> ''
       AND NOT EXISTS (
           SELECT 1 FROM occurrences.rules_prioritization rp WITH (NOLOCK)
-          WHERE rp.id = s.id_rule_prioritization COLLATE Latin1_General_CS_AS
-            AND rp.id_company = s.id_company COLLATE Latin1_General_CS_AS
+          -- Correção: Collation explícito aqui também!
+          WHERE rp.id COLLATE Latin1_General_CS_AS = ocs.id_rule_prioritization 
+            AND rp.id_company COLLATE Latin1_General_CS_AS = ocs.id_company 
       );
 
     -- INSERÇÃO DOS DADOS VÁLIDOS
@@ -140,40 +153,52 @@ BEGIN
             days_causes_analysis, days_action_plan_elaboration, days_action_plan_execution,
             days_effectiveness_check, days_standardization, days_evaluation,
             active_cause_analysis, active_effectiveness_check, active_standardization,
-            aprove_evaluation, all_types_associated, id_rule_prioritization
+            aprove_cause_analysis, aprove_action_plan_elaboration, aprove_action_plan_execution,
+            aprove_effectiveness_check, aprove_standardization, aprove_evaluation, all_types_associated,
+            id_rule_prioritization
         )
     SELECT
-        s.id_company,
-        ISNULL(s.id_method, 1) AS id_method,
-        s.name,
-        NULLIF(s.description, '') AS description,
-        NULLIF(s.icon, '') AS icon,
-        CASE WHEN s.is_active COLLATE Latin1_General_CS_AS = 'Inativo' THEN 0 ELSE 1 END AS is_active,
+        ocs.id_company,
+        ISNULL(ocs.id_method, 1) AS id_method, 
+        ocs.name,
+        NULLIF(ocs.description, '') AS description,
+        NULLIF(ocs.icon, '') AS icon,
+        CASE WHEN ocs.is_active = 'Inativo' THEN 0 ELSE 1 END AS is_active,
         SYSDATETIMEOFFSET() AS creation_date,
         SYSDATETIMEOFFSET() AS last_modified,
         0 AS removed,
-        CASE WHEN s.active_cause_analysis COLLATE Latin1_General_CS_AS = 'Sim'
-             THEN TRY_CAST(s.days_causes_analysis AS INT) ELSE NULL END,
-        ISNULL(TRY_CAST(s.days_action_plan_elaboration AS INT), 0),
-        ISNULL(TRY_CAST(s.days_action_plan_execution AS INT), 0),
-        CASE WHEN s.active_effectiveness_check COLLATE Latin1_General_CS_AS = 'Sim'
-             THEN TRY_CAST(s.days_effectiveness_check AS INT) ELSE NULL END,
-        CASE WHEN s.active_standardization COLLATE Latin1_General_CS_AS = 'Sim'
-             THEN TRY_CAST(s.days_standardization AS INT) ELSE NULL END,
-        TRY_CAST(s.days_evaluation AS INT),
-        CASE WHEN s.active_cause_analysis COLLATE Latin1_General_CS_AS = 'Sim' THEN 1 ELSE 0 END,
-        CASE WHEN s.active_effectiveness_check COLLATE Latin1_General_CS_AS = 'Sim' THEN 1 ELSE 0 END,
-        CASE WHEN s.active_standardization COLLATE Latin1_General_CS_AS = 'Sim' THEN 1 ELSE 0 END,
-        CASE WHEN s.aprove_evaluation COLLATE Latin1_General_CS_AS = 'Sim' THEN 1 ELSE 0 END,
-        CASE WHEN s.all_types_associated COLLATE Latin1_General_CS_AS = 'Sim' THEN 1 ELSE 0 END,
-        NULLIF(LTRIM(RTRIM(s.id_rule_prioritization)), '')
-    FROM import.occurrences_categories_staging s WITH (NOLOCK)
-    WHERE s.id_batch = @id_batch
-      AND NOT EXISTS (SELECT 1 FROM import.errors e WHERE e.id_batch = s.id_batch AND e.row_num = s.row_num);
+        CASE WHEN ocs.active_cause_analysis = 'Sim' THEN TRY_CAST(ocs.days_causes_analysis AS INT) ELSE NULL END,
+        ISNULL(TRY_CAST(ocs.days_action_plan_elaboration AS INT), 0),
+        ISNULL(TRY_CAST(ocs.days_action_plan_execution AS INT), 0),
+        CASE WHEN ocs.active_effectiveness_check = 'Sim' THEN TRY_CAST(ocs.days_effectiveness_check AS INT) ELSE NULL END,
+        CASE WHEN ocs.active_standardization = 'Sim' THEN TRY_CAST(ocs.days_standardization AS INT) ELSE NULL END,
+        TRY_CAST(ocs.days_evaluation AS INT),
+        CASE WHEN ocs.active_cause_analysis = 'Sim' THEN 1 ELSE 0 END,
+        CASE WHEN ocs.active_effectiveness_check = 'Sim' THEN 1 ELSE 0 END,
+        CASE WHEN ocs.active_standardization = 'Sim' THEN 1 ELSE 0 END,
+        CASE WHEN ocs.aprove_cause_analysis = 'Sim' THEN 1 ELSE 0 END,
+        CASE WHEN ocs.aprove_action_plan_elaboration = 'Sim' THEN 1 ELSE 0 END,
+        CASE WHEN ocs.aprove_action_plan_execution = 'Sim' THEN 1 ELSE 0 END,
+        CASE WHEN ocs.aprove_effectiveness_check = 'Sim' THEN 1 ELSE 0 END,
+        CASE WHEN ocs.aprove_standardization = 'Sim' THEN 1 ELSE 0 END,
+        CASE WHEN ocs.aprove_evaluation = 'Sim' THEN 1 ELSE 0 END,
+        CASE WHEN ocs.all_types_associated = 'Sim' THEN 1 ELSE 0 END,
+        NULLIF(LTRIM(RTRIM(ocs.id_rule_prioritization)), '')
+    FROM import.occurrences_categories_staging ocs WITH (NOLOCK)
+    WHERE ocs.id_batch = @id_batch
+      AND NOT EXISTS (
+          SELECT 1 
+          FROM import.errors e 
+          WHERE e.id_batch = ocs.id_batch 
+            AND e.row_num = ocs.row_num
+      );
 
 END
 GO
 
+USE [qualiex_common]
+GO
+
 CREATE OR ALTER PROCEDURE [import].[get_errors_occurrences_categories]
 (
     @id_batch UNIQUEIDENTIFIER
@@ -185,14 +210,13 @@ BEGIN
     SELECT
         STRING_AGG(CAST(e.error_msg AS NVARCHAR(MAX)), '; ') WITHIN GROUP (ORDER BY e.error_msg) AS error_msg,
         e.row_num,
-        s.name
+        ocs.name
     FROM import.errors e WITH (NOLOCK)
-    JOIN import.occurrences_categories_staging s WITH (NOLOCK) ON s.row_num = e.row_num AND s.id_batch = e.id_batch
+    JOIN import.occurrences_categories_staging ocs WITH (NOLOCK) 
+        ON ocs.row_num = e.row_num 
+       AND ocs.id_batch = e.id_batch
     WHERE e.id_batch = @id_batch
-    GROUP BY e.row_num, s.name
+    GROUP BY e.row_num, ocs.name
     ORDER BY e.row_num;
 END
-GO
-
--- commit
--- rollback
+GO