@orbe-agro/client-core 5.3.98 → 5.3.100

package/lib/@ecme/@types/auth.ts

@@ -1,3 +1,5 @@
+import { TVinculosUsuario } from "@base/@types/models/adm/user"
+
 export type SignInCredential = {
     username: string
     password: string
@@ -43,6 +45,7 @@ export type User = {
     authority?: string[]
     primeiroAcesso?: boolean
     funcionalidades?: string[]
+    vinculosUsuario?: TVinculosUsuario | null
 }
 
 export type Token = {

package/lib/@ecme/auth/AuthProvider.tsx

@@ -12,7 +12,7 @@ import { useSessionUser, useToken } from "@/store/authStore";
 import { ReactNode, Ref, useImperativeHandle, useRef } from "react";
 import { NavigateFunction, useNavigate } from "react-router-dom";
 import AuthContext from "./AuthContext";
-import { apiFetchUserFuncionalidades } from "@base/services";
+import { apiFetchUserFuncionalidades, apiFetchUserVinculosUsuario } from "@base/services";
 
 type AuthProviderProps = { children: ReactNode };
 
@@ -77,12 +77,14 @@ function AuthProvider({ children }: AuthProviderProps) {
       if (resp) {
         handleSignIn({ accessToken: resp.jwtToken });
         const funcionalidades = await apiFetchUserFuncionalidades(resp.id);
+        const vinculosUsuario = await apiFetchUserVinculosUsuario(resp.id);
 
         const newUser = {
           userId: resp.id.toString(),
           userName: resp.nome,
           primeiroAcesso: resp.primeiroAcesso,
-          authority: funcionalidades
+          authority: funcionalidades,
+          vinculosUsuario: vinculosUsuario
         };
         setUser(newUser);
         redirect(newUser);

package/lib/@ecme/store/authStore.ts

@@ -41,6 +41,7 @@ const initialState: AuthState = {
         email: '',
         authority: [],
         funcionalidades: [],
+        vinculosUsuario: null
     },
 }
 
@@ -62,6 +63,7 @@ export const useSessionUser = create<AuthState & AuthAction>()(
                         ...payload,
                         funcionalidades:
                             payload.funcionalidades || state.user.funcionalidades,
+                        vinculosUsuario: payload.vinculosUsuario || state.user.vinculosUsuario,
                     },
                 })),
         }),

package/lib/base/@types/forms/commodities/contratoBiodiesel/index.ts

@@ -1,3 +1,4 @@
+import { TUser } from '@base/@types/models/adm/user';
 import { TBusinessPartner } from '@base/@types/models/dm/businessPartner';
 import { TProduto } from '@base/@types/models/dm/produto';
 import type { Control, FieldErrors, FieldValues, UseFormGetValues, UseFormRegister, UseFormSetValue, UseFormWatch } from 'react-hook-form';
@@ -7,6 +8,7 @@ export interface IFormSectionBaseProps<T extends FieldValues> {
     errors: FieldErrors<T>;
     getValues?: UseFormGetValues<T>;
     setValue?: UseFormSetValue<T>;
+    user?: TUser | null;
     isView?: boolean;
     index?: number;
     watch?: UseFormWatch<T>;

package/lib/base/@types/forms/index.ts

@@ -1,4 +1,5 @@
 import type { Control, FieldErrors, FieldValues, UseFormGetValues, UseFormRegister, UseFormSetValue, UseFormWatch } from 'react-hook-form';
+import { TUser } from '../models/adm/user';
 
 export interface IFormSectionBaseProps<T extends FieldValues> {
     control: Control<T>
@@ -7,6 +8,7 @@ export interface IFormSectionBaseProps<T extends FieldValues> {
     getValues?: UseFormGetValues<T>;
     setValue?: UseFormSetValue<T>
     isView?: boolean
+    user?: TUser | null;
     index?: number
     watch?: UseFormWatch<T>
     register?: UseFormRegister<T>

package/lib/base/@types/models/adm/user.ts

@@ -9,6 +9,7 @@ export type TUser = {
     celular?: string
     empresa?: string
     roles?: TRoles[] | null
+    vinculosUsuario?: TVinculosUsuario | null
     ativo?: boolean
     primeiroLogin?: boolean
     selecionaDeposito?: boolean
@@ -20,3 +21,8 @@ export type TRoles = {
     name: string
     descricao: string
 }
+
+export type TVinculosUsuario = {
+    id?: number
+    vendedorId?: number | null
+}

package/lib/base/@types/models/transportadora/material.ts

@@ -1,11 +1,6 @@
-export type TDescricoes = {
-    id?: number,
-    nDoMaterial: string,
-    textoMaterial: string,
-
-}
-
 export type TMaterial = {
     id?: number,
-    DescricaoMaterial: TDescricoes,
+    codigo: string,
+    descricao: string,
+    unidadesMedida: string[]
 }

package/lib/base/@types/models/transportadora/municipio.ts

@@ -2,5 +2,5 @@ export type TMunicipio = {
     id?: number,
     uf: string,
     municipio: string,
-    codigo?: string,
+    codigo: string,
 }

package/lib/base/@types/models/transportadora/ordemCarregamento.ts

@@ -1,4 +1,4 @@
-import { TCliente } from "../dm/businessPartner";
+import { TCliente, TBusinessPartner } from "../dm/businessPartner";
 import { TCarga } from "./carga";
 import { TMaterial } from "./material";
 import { TMotorista } from "./motorista";
@@ -16,42 +16,64 @@ export type TDadosComplementaresOrdemCarregamento = {
     quantidadeTempoTransportouParaAEmpresa?: string,
 }
 
-export type TFormCargaOrdemCarregamento = {
+export type TCargaOrdemCarregamento = {
     peso: number,
     preco: number,
+    produtoId: number,
+}
+
+export type TContatoOrdemCarregamento = {
+    id?: number,
+    nome: string,
+    tipoContato: number,
+    tipoRetorno: number,
+    descricao: string
 }
 
 export type TOrdemCarregamento = {
     id?: number | undefined,
-    produto: TMaterial,
-    empresa: TCliente,
-    fornecedor: string,
-    motorista: TMotorista,
-    localCarregamento: Date,
-    veiculos: TVeiculo[],
-    formCidadeOrigem: TMunicipio,
+    status?: string,
+    dtCadastro?: Date,
+    veiculoIds: number[],
+    motoristaId: number,
+    proprietarioId: number,
+    // Campos de localização
     cidadeOrigem: string,
     ufOrigem: string,
-    formCidadeDestino: TMunicipio,
     cidadeDestino: string,
     ufDestino: string,
-    dtCarregamento: Date,
-    observacao: string,
-    moduloTransporte: string,
-    consultaBuonny: string,
-    consultaVerttice: string,
-    viagemPedagioSolucaoId: string,
-    viagemPedagioTagEmissorId: string,
-    tipoCarga: string,
-    formTipo: string,
+    // Campos de consulta
+    consultaBuonny?: string,
+    consultaVerttice?: string,
+    laudoGuep?: string,
+    referenciaGuep?: string,
+    // Dados complementares
     tipoCargaBuonny: string,
-    consultaBuonnyTipo: string,
-    material: TMaterial,
-    formCarga: TFormCargaOrdemCarregamento
+    observacao?: string,
+    cargas: TCargaOrdemCarregamento[],
+    contatos?: TContatoOrdemCarregamento[],
     dadosComplementares?: TDadosComplementaresOrdemCarregamento,
-    formNome: string,
-    formDescricao: string,
-    formTipoRetorno: string,
-    cargas: TCarga[],
+    ticketId?: number,
+    ativo?: boolean,
+    // Campos do formulário (mantidos para compatibilidade com o form)
+    produto?: TMaterial,
+    empresa?: TCliente,
+    proprietario?: TBusinessPartner,
+    motorista?: TMotorista,
+    localCarregamento?: string,
+    veiculos?: TVeiculo[] | undefined,
+    formCidadeOrigem?: TMunicipio,
+    formCidadeDestino?: TMunicipio,
+    dtCarregamento?: string,
+    moduloTransporte?: string,
+    viagemPedagioSolucaoId?: string,
+    viagemPedagioTagEmissorId?: string,
+    tipoCarga?: string,
+    formTipo?: number,
+    consultaBuonnyTipo?: string,
+    material?: string,
+    formNome?: string,
+    formDescricao?: string,
+    formTipoRetorno?: string,
 }
 

package/lib/base/@types/models/transportadora/veiculo.ts

@@ -11,7 +11,7 @@ export type TVeiculo = {
   rntrc: string,
   situacao: string,
   proprietario?: TVeiculoProprietario,
-  placa1?: string,
-  placa2?: string,
+  placa1?: string | undefined,
+  placa2?: string | undefined,
 }
 

package/lib/base/@types/models/user.ts

@@ -5,6 +5,7 @@ export type TUser = {
     email: string
     password: string
     roles: Set<TRole>
+    vinculosUsuario?: TVinculosUsuario | null
     centrosDeCusto: Set<TCentroDeCusto>
     metricas: Set<TMetrica>
     token: string
@@ -40,6 +41,11 @@ export type TRole = {
     name: string
 }
 
+export type TVinculosUsuario = {
+    id?: number
+    vendedorId?: number | null
+}
+
 export type TCentroDeCusto = {
     id: number
     name: string

package/lib/base/configs/endpoints.config/adm/config/users.ts

@@ -6,6 +6,7 @@ const users = {
     findForEquipeVendas: `/dados-mestres/api/user/fetch-user-equipe-venda/`,
     findAllRegional: `/dados-mestres/api/user/fetch-regional-venda`,
     findProductsMonitor: `/dados-mestres/api/user/find-monitor`,
+    findVinculosUsuarioByUserId: `/dados-mestres/api/user/vinculos-usuario`,
 }
 
 export default users

package/lib/base/configs/endpoints.config/dm/config/businessPartner.ts

@@ -9,6 +9,9 @@ const businessPartner = {
     findMonitorTransportadora: { endpoint: `${BUSINESS_PARTNER_BASE_URL}/find-monitor-transportadora`, httpMethod: 'post' },
     findBusinessPartnerFiliais: { endpoint: `${BUSINESS_PARTNER_BASE_URL}/find-business-partner-filiais`, method: 'post' },
     findBusinessPartnerMatrizes: { endpoint: `${BUSINESS_PARTNER_BASE_URL}/find-business-partner-matrizes`, method: 'post' },
+    findBusinessPartnerFuncoesParceirosClientes: { endpoint: `${BUSINESS_PARTNER_BASE_URL}/find-bp-vinculo-funcao-parceiros-clientes`, method: 'post' },
+    findBusinessPartnerFuncoesParceirosFornecedores: { endpoint: `${BUSINESS_PARTNER_BASE_URL}/find-bp-vinculo-funcao-parceiros-fornecedores`, method: 'post' },
+    findBusinessPartnerByClientOrSupplierFunction: { endpoint: `${BUSINESS_PARTNER_BASE_URL}/find-vendedores-aka-representantes-vendas`, method: 'get' },
 }
 
 export default businessPartner

package/lib/base/hooks/dm/businessPartner/useBusinessPartnerFuncoesParceirosClientesList.tsx

@@ -0,0 +1,33 @@
+import { apiFindDmBusinessPartnerFuncoesParceirosClientes } from '@base/services/modules/dm/businessPartner/BusinessPartnerService'
+import { useBusinessPartnerListStore } from '@base/store/dm/businesPartner/businessPartnerListStore';
+import useSWR from 'swr'
+
+export default function useBusinessPartnerFuncoesParceirosClientesList() {
+    const { tableParams, filterParams, setTableParams, setFilterParams } =
+        useBusinessPartnerListStore((state) => state);
+
+    const swrKey = ["/api/dm/business-partner/find-bp-vinculo-funcao-parceiros-clientes", filterParams];
+
+    const { data, error, isLoading, mutate } = useSWR(
+        swrKey,
+        () => apiFindDmBusinessPartnerFuncoesParceirosClientes(filterParams),
+        { revalidateOnFocus: false }
+    );
+
+    const businessPartnerFuncoesParceirosClientesList = data || [];
+
+    const businessPartnerFuncoesParceirosClientesListTotal = data?.length || 0;
+
+    return {
+        data,
+        businessPartnerFuncoesParceirosClientesList,
+        businessPartnerFuncoesParceirosClientesListTotal,
+        error,
+        isLoading,
+        tableParams,
+        filterParams,
+        mutate,
+        setTableParams,
+        setFilterParams,
+    };
+}

package/lib/base/hooks/dm/businessPartner/useBusinessPartnerFuncoesParceirosFornecedoresList.tsx

@@ -0,0 +1,33 @@
+import { apiFindDmBusinessPartnerFuncoesParceirosFornecedores } from '@base/services/modules/dm/businessPartner/BusinessPartnerService'
+import { useBusinessPartnerListStore } from '@base/store/dm/businesPartner/businessPartnerListStore';
+import useSWR from 'swr'
+
+export default function useBusinessPartnerFuncoesParceirosFornecedoresList() {
+    const { tableParams, filterParams, setTableParams, setFilterParams } =
+        useBusinessPartnerListStore((state) => state);
+
+    const swrKey = ["/api/dm/business-partner/find-bp-vinculo-funcao-parceiros-fornecedores", filterParams];
+
+    const { data, error, isLoading, mutate } = useSWR(
+        swrKey,
+        () => apiFindDmBusinessPartnerFuncoesParceirosFornecedores(filterParams),
+        { revalidateOnFocus: false }
+    );
+
+    const businessPartnerFuncoesParceirosFornecedoresList = data || [];
+
+    const businessPartnerFuncoesParceirosFornecedoresListTotal = data?.length || 0;
+
+    return {
+        data,
+        businessPartnerFuncoesParceirosFornecedoresList,
+        businessPartnerFuncoesParceirosFornecedoresListTotal,
+        error,
+        isLoading,
+        tableParams,
+        filterParams,
+        mutate,
+        setTableParams,
+        setFilterParams,
+    };
+}

package/lib/base/hooks/dm/businessPartner/useVendedoresAKARepresentantesVendasList.tsx

@@ -0,0 +1,34 @@
+
+import { apiFindDmVendedoresAKARepresentantesVendas } from '@base/services/modules/dm/businessPartner/BusinessPartnerService'
+import { useBusinessPartnerListStore } from '@base/store/dm/businesPartner/businessPartnerListStore';
+import useSWR from "swr";
+
+export default function useVendedoresAKARepresentantesVendasList() {
+    const { tableParams, filterParams, setTableParams, setFilterParams } =
+        useBusinessPartnerListStore((state) => state);
+
+    const swrKey = ["/api/dm/business-partner/find-vendedores-aka-representantes-vendas", filterParams];
+
+    const { data, error, isLoading, mutate } = useSWR(
+        swrKey,
+        () => apiFindDmVendedoresAKARepresentantesVendas(),
+        { revalidateOnFocus: false }
+    );
+
+    const clientOrSupplierFunctionList = data || [];
+
+    const clientOrSupplierFunctionListTotal = data?.length || 0;
+
+    return {
+        data,
+        clientOrSupplierFunctionList,
+        clientOrSupplierFunctionListTotal,
+        error,
+        isLoading,
+        tableParams,
+        filterParams,
+        mutate,
+        setTableParams,
+        setFilterParams,
+    };
+}

package/lib/base/hooks/index.ts

@@ -1,13 +1,15 @@
 // Hooks exports from base
 export { default as useRolesList } from './adm/roles/useRolesList';
 export { default as useUsersList } from './adm/users/useUsersList';
-export { default as useUserList } from './dm/user/useUserList';
 export { default as useBusinessPartnerById } from './dm/businessPartner/useBusinessPartnerById';
 export { default as useBusinessPartnerClienteList } from './dm/businessPartner/useBusinessPartnerClienteList';
 export { default as useBusinessPartnerFiliaisList } from './dm/businessPartner/useBusinessPartnerFiliaisList';
 export { default as useBusinessPartnerFornecedorList } from './dm/businessPartner/useBusinessPartnerFornecedorList';
+export { default as useBusinessPartnerFuncoesParceirosClientesList } from './dm/businessPartner/useBusinessPartnerFuncoesParceirosClientesList';
+export { default as useBusinessPartnerFuncoesParceirosFornecedoresList } from './dm/businessPartner/useBusinessPartnerFuncoesParceirosFornecedoresList';
 export { default as useBusinessPartnerList } from './dm/businessPartner/useBusinessPartnerList';
 export { default as useBusinessPartnerMatrizesList } from './dm/businessPartner/useBusinessPartnerMatrizesList';
+export { default as useVendedoresAKARepresentantesVendasList } from './dm/businessPartner/useVendedoresAKARepresentantesVendasList';
 export { default as useCanalDistribuicaoByCodigoList } from './dm/canalDistribuicao/useCanalDistribuicaoByCodigoList';
 export { default as useCanalDistribuicaoList } from './dm/canalDistribuicao/useCanalDistribuicaoList';
 export { default as useCentroByCodigoList } from './dm/centro/useCentroByCodigoList';
@@ -40,5 +42,6 @@ export { default as useTipoOrdemVendaByCodigoList } from './dm/tipoOrdemVenda/us
 export { default as useTipoOrdemVendaList } from './dm/tipoOrdemVenda/useTipoOrdemVendaList';
 export { default as useTipoVeiculoByCodigoList } from './dm/tipoVeiculo/useTipoVeiculoByCodigoList';
 export { default as useTipoVeiculoList } from './dm/tipoVeiculo/useTipoVeiculoList';
+export { default as useUserList } from './dm/user/useUserList';
 export { default as useList } from './useList';
 

package/lib/base/services/modules/AdmService.ts

@@ -2,6 +2,7 @@ import { IFilterParams, TQueryResponse } from '@base/@types/api'
 import endpointNavigationConfig from '@base/configs/endpoints.config/endpoints.navigation'
 import ApiService from '@/services/ApiService'
 import { TUser } from '@base/@types/models/user'
+import { TVinculosUsuario } from '@base/@types/models/adm/user'
 
 export async function apiGetUsers(body?: IFilterParams) {
     return ApiService.fetchDataWithAxios<TQueryResponse<TUser>>({
@@ -25,3 +26,10 @@ export const apiFetchUserFuncionalidades = async (userId: number) => {
     method: 'get',
   });
 };
+
+export const apiFetchUserVinculosUsuario = async (userId: number) => {
+  return ApiService.fetchDataWithAxios<TVinculosUsuario>({
+    url: endpointNavigationConfig.users.findVinculosUsuarioByUserId + `/${userId}`,
+    method: 'get',
+  });
+};

package/lib/base/services/modules/dm/businessPartner/BusinessPartnerService.ts

@@ -78,4 +78,34 @@ export async function apiFindDmBusinessPartnerMatrizes(body?: IFilterParams) {
         method: BUSINESS_PARTNER_ENDPOINT.findBusinessPartnerMatrizes.method,
         data: body,
     })
+}
+
+export async function apiFindDmBusinessPartnerFuncoesParceirosClientes(body?: IFilterParams) {
+    if (!body || Object.keys(body).length === 0) {
+        return undefined
+    }
+    return ApiService.fetchDataWithAxios<TBusinessPartner[]>({
+        url: BUSINESS_PARTNER_ENDPOINT.findBusinessPartnerFuncoesParceirosClientes.endpoint,
+        method: BUSINESS_PARTNER_ENDPOINT.findBusinessPartnerFuncoesParceirosClientes.method,
+        data: body,
+    })
+}
+
+export async function apiFindDmBusinessPartnerFuncoesParceirosFornecedores(body?: IFilterParams) {
+    if (!body || Object.keys(body).length === 0) {
+        return undefined
+    }
+    return ApiService.fetchDataWithAxios<TBusinessPartner[]>({
+        url: BUSINESS_PARTNER_ENDPOINT.findBusinessPartnerFuncoesParceirosFornecedores.endpoint,
+        method: BUSINESS_PARTNER_ENDPOINT.findBusinessPartnerFuncoesParceirosFornecedores.method,
+        data: body,
+    })
+}
+
+export async function apiFindDmVendedoresAKARepresentantesVendas(data = {}) {
+    return ApiService.fetchDataWithAxios<TBusinessPartner[]>({
+        url: BUSINESS_PARTNER_ENDPOINT.findBusinessPartnerByClientOrSupplierFunction.endpoint,
+        method: BUSINESS_PARTNER_ENDPOINT.findBusinessPartnerByClientOrSupplierFunction.method,
+        data,
+    });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbe-agro/client-core",
-  "version": "5.3.98",
+  "version": "5.3.100",
   "description": "Biblioteca principal de componentes e utilidades para os microfrontends do Orbe Agro.",
   "type": "module",
   "main": "./dist/index.js",