From 59b149eb9333577ead000de5154e2726baec2d23 Mon Sep 17 00:00:00 2001 From: Felix Morales Date: Wed, 20 Mar 2024 11:43:26 -0500 Subject: [PATCH] Cambiar tipo de dato de Aduna para que se trabaje como una cadena de texto --- .../Corresponsales/CCorresponsalesTrafico.ts | 6 +-- .../CatCorresponsales/CatCorresponsales.tsx | 44 +++++++------------ .../Clientes/Traficos/RptClientesTraficos.tsx | 4 +- .../Clientes/Traficos/TraficoCliente.tsx | 27 +----------- .../PedimentosConsolidados.tsx | 6 +-- .../Rectificaciones/NuevaRectificacion.tsx | 6 +-- .../Corresponsales/TraficoCorresponsales.tsx | 8 ++-- .../Reportes/RptCorresponsalesTraficos.tsx | 6 +-- .../Reportes/RptCorresponsalesTraficosHst.tsx | 2 +- .../ReportesClientes/GC50/ReporteGC50.tsx | 4 +- .../DTOFiltrosTraficosClientes.ts | 2 +- .../DTOPedimentosConsolidados.ts | 2 +- .../DTORectificacionHistorico.ts | 4 +- .../DTORptCorresponsalesTraficos.ts | 2 +- src/DTO/Reportes/GC50/DTOReporteGC50.ts | 2 +- .../Catalogos/ICatCorresponsales.ts | 2 +- .../ICorresponsalRectificacionHistorico.ts | 2 +- .../Corresponsales/ICorresponsalTrafico.ts | 2 +- .../IReporteOperacionesNewell.ts | 2 +- .../Corresponsales.Trafico.Services.ts | 2 +- .../CatCorresponsalesSlice.ts | 2 +- .../CorresponsalesTraficoSlice.ts | 2 +- 22 files changed, 51 insertions(+), 88 deletions(-) diff --git a/src/Classes/Corresponsales/CCorresponsalesTrafico.ts b/src/Classes/Corresponsales/CCorresponsalesTrafico.ts index cc6b737..db4ef44 100644 --- a/src/Classes/Corresponsales/CCorresponsalesTrafico.ts +++ b/src/Classes/Corresponsales/CCorresponsalesTrafico.ts @@ -14,7 +14,7 @@ export default class CCorresponsalesTrafico implements ICorresponsalTrafico { kilos?: number estatus?: number trafico?: string - aduana?: number + aduana?: string patente?: number pedimento?: number clave?: string @@ -63,7 +63,7 @@ export default class CCorresponsalesTrafico implements ICorresponsalTrafico { this.kilos=0 this.estatus=0 this.trafico='' - this.aduana=0 + this.aduana='0' this.patente=0 this.pedimento=0 this.clave='' @@ -115,7 +115,7 @@ export default class CCorresponsalesTrafico implements ICorresponsalTrafico { kilos :0, estatus :0, trafico :'', - aduana :0, + aduana :'0', patente :0, pedimento :0, clave :'', diff --git a/src/Components/Catalogos/CatCorresponsales/CatCorresponsales.tsx b/src/Components/Catalogos/CatCorresponsales/CatCorresponsales.tsx index 7abcd58..84ef263 100644 --- a/src/Components/Catalogos/CatCorresponsales/CatCorresponsales.tsx +++ b/src/Components/Catalogos/CatCorresponsales/CatCorresponsales.tsx @@ -37,7 +37,7 @@ export const CatCorresponsales: FC = (props) => { // const [IDCorresponsal, setIDCorresponsal] = useState(0) const [Nombre, setNombre] = useState('') const [Patente, setPatente] = useState(0) - const [Aduana, setAduana] = useState(0) + const [Aduana, setAduana] = useState('0') const [Correos, setCorreos] = useState('') useEffect(() => { @@ -113,7 +113,7 @@ export const CatCorresponsales: FC = (props) => { setShowMsg(true) return false } - if (Aduana < 99) { + if (Aduana === '' || Aduana === '0' || Aduana === ' ' || Aduana === undefined || Aduana === null || Aduana.length < 3) { setHeader('Error!') setMsgColor('danger') setMsg('La aduana debe tener 3 digitos') @@ -149,7 +149,7 @@ export const CatCorresponsales: FC = (props) => { setId(0) setNombre('') setPatente(0) - setAduana(0) + setAduana('') } const deleteItem = () => { @@ -279,34 +279,20 @@ export const CatCorresponsales: FC = (props) => { Aduana - { - const { formattedValue, value } = values - setAduana(value) + onChange={(e) => { + setAduana(e.target.value) + }} + style={{ + fontSize: '18px', + backgroundColor: '#F5FFED', + border: '2px solid #25D05B', + width: '60px', + textAlign: 'right', + borderRadius: '10px', + padding: '1px 2px' }} - style={ - Depto === 'Corresponsalias' - ? { - fontSize: '18px', - backgroundColor: '#F5FFED', - border: '2px solid #25D05B', - width: '60px', - textAlign: 'right', - borderRadius: '10px', - } - : { - fontSize: '18px', - backgroundColor: '#F5FFED', - border: '2px solid #25D05B', - width: '60px', - textAlign: 'right', - borderRadius: '10px', - paddingRight: '5px', - paddingLeft: '5px', - } - } /> diff --git a/src/Components/Clientes/Traficos/RptClientesTraficos.tsx b/src/Components/Clientes/Traficos/RptClientesTraficos.tsx index a03c566..ad83396 100644 --- a/src/Components/Clientes/Traficos/RptClientesTraficos.tsx +++ b/src/Components/Clientes/Traficos/RptClientesTraficos.tsx @@ -75,7 +75,7 @@ export default function RptClientesTraficos(props: IProps) { //const [Corresponsal, setCorresponsal] = useState(0) const [Pedimento, setPedimento] = useState(0) const [Patente, setPatente] = useState(0); - const [Aduana, setAduana] = useState(0); + const [Aduana, setAduana] = useState('0'); const [Referencia, setReferencia] = useState('') const [Clientes, setClientes] = useState>() const [filtro, setFiltro] = useState('') @@ -373,7 +373,7 @@ export default function RptClientesTraficos(props: IProps) { type='text' size='sm' placeholder='Aduana' - onChange={(e) => setAduana(+e.target.value)} + onChange={(e) => setAduana(e.target.value === '' ? '0' : e.target.value)} /> diff --git a/src/Components/Clientes/Traficos/TraficoCliente.tsx b/src/Components/Clientes/Traficos/TraficoCliente.tsx index a5de549..131f677 100644 --- a/src/Components/Clientes/Traficos/TraficoCliente.tsx +++ b/src/Components/Clientes/Traficos/TraficoCliente.tsx @@ -172,7 +172,7 @@ export default function TraficoCliente(props:IProps){ const [Kilos, setKilos] = useState(0) const [Estatus, setEstatus] = useState(0) const [Trafico, setTrafico] = useState('') - const [Aduana, setAduana] = useState(0) + const [Aduana, setAduana] = useState('0') const [Patente, setPatente] = useState(0) const [Pedimento, setPedimento] = useState(0) const [ClavePedimento, setClavePedimento] = useState('') @@ -879,7 +879,7 @@ export default function TraficoCliente(props:IProps){ useEffect(() => { if ( IDCorresponsal !== 0 && - Aduana !== 0 && + Aduana !== '' && Aduana !== '0' && Aduana !== ' ' && Aduana !== undefined && Aduana !== null && Patente !== 0 && Pedimento !== 0 && FechaPago !== '' && @@ -1097,15 +1097,6 @@ export default function TraficoCliente(props:IProps){ return '' } - function openSOIA() { - let id: number = Aduana ? Aduana : 0 - window.open( - `https://aplicacionesc.mat.sat.gob.mx/SOIA_CR_WEB/oia_consultarapd_cep.aspx?&pa=${Patente}&dn=${Pedimento}&s=0&ap=${getCurrentYear()}&pad=${Aduana}&ad=${getAduana( - id - )}` - ) - } - let handleColor = (time: Date) => { return time.getHours() > 12 ? 'text-success' : 'text-error' } @@ -1681,20 +1672,6 @@ export default function TraficoCliente(props:IProps){ readOnly= {Depto !== 'Corresponsalias' ? true : false} format={'### ####'} mask="_" - onValueChange={(values: any) => { - const { value } = values - if(value.length === 7 ){ - CTrafDataService.ValidaTraficoDuplicado(Aduana, Patente, value, IDTrafico).then( response => { - if(response.data !== ""){ - setHeader('Informativo') - setMsg(`Pedimento Duplicado.\n\rLa referencia ${response.data} ya cuenta con los mismos datos de aduana, patente y pedimento`) - setShowMsg(true) - return - } - setPedimento(value.length === 0 ? 0 : value) - }) - } - }} style={{ fontSize: '18px', backgroundColor: '#FEFDF5', diff --git a/src/Components/Corresponsales/PedimentosConsolidados/PedimentosConsolidados.tsx b/src/Components/Corresponsales/PedimentosConsolidados/PedimentosConsolidados.tsx index b1ef50c..1351f0e 100644 --- a/src/Components/Corresponsales/PedimentosConsolidados/PedimentosConsolidados.tsx +++ b/src/Components/Corresponsales/PedimentosConsolidados/PedimentosConsolidados.tsx @@ -22,7 +22,7 @@ import '../../../css/generic01.css' interface IProps { IdTrafico: number - Aduana: number + Aduana: string Patente: number ClavesPedimento: ICatClavesPedimentos[] Depto: string @@ -83,7 +83,7 @@ export const PedimentosConsolidados:React.FC = (props) => { } const Append = () => { - if(Aduana !== 0 && + if(Aduana !== '' && Aduana !== '0' && Aduana !== ' ' && Aduana !== undefined && Aduana !== null && Patente !== 0 && Pedimento !== 0 && FechaPago !== '' && @@ -165,7 +165,7 @@ export const PedimentosConsolidados:React.FC = (props) => { Aduana - setAduana(+e.target.value)}> + setAduana(e.target.value)}> diff --git a/src/Components/Corresponsales/Rectificaciones/NuevaRectificacion.tsx b/src/Components/Corresponsales/Rectificaciones/NuevaRectificacion.tsx index bb20c81..dfba11c 100644 --- a/src/Components/Corresponsales/Rectificaciones/NuevaRectificacion.tsx +++ b/src/Components/Corresponsales/Rectificaciones/NuevaRectificacion.tsx @@ -17,7 +17,7 @@ import { MsgInformativo } from "../../Utils/Toast/msgInformativo"; interface IProps { IdTrafico: number - Aduana: number + Aduana: string Patente: number ClavesPedimento: ICatClavesPedimentos[] Pedimentos: DTOPedimentosConsolidados[] @@ -140,7 +140,7 @@ export const NuevaRectificacion:React.FC = (props) => { } const CancelIsRectificacion = () => { - setAduanaH(0) + setAduanaH('0') setPatenteH(0) setPedimentoH(0) setClavePedimentoH('') @@ -250,7 +250,7 @@ export const NuevaRectificacion:React.FC = (props) => { Aduana - setAduana(+e.target.value)}> + setAduana(e.target.value)}> diff --git a/src/Components/Corresponsales/TraficoCorresponsales.tsx b/src/Components/Corresponsales/TraficoCorresponsales.tsx index a322c3a..c8500b5 100644 --- a/src/Components/Corresponsales/TraficoCorresponsales.tsx +++ b/src/Components/Corresponsales/TraficoCorresponsales.tsx @@ -222,7 +222,7 @@ export default function TraficoCorresponsales (props:IProps) { const [Kilos, setKilos] = useState(0) const [Estatus, setEstatus] = useState(0) const [Trafico, setTrafico] = useState('') - const [Aduana, setAduana] = useState(0) + const [Aduana, setAduana] = useState('0') const [Patente, setPatente] = useState(0) const [Pedimento, setPedimento] = useState(0) const [ClavePedimento, setClavePedimento] = useState('') @@ -991,7 +991,7 @@ export default function TraficoCorresponsales (props:IProps) { if(PedimentoObligatorio){ if ( IDCorresponsal !== 0 && - Aduana !== 0 && + Aduana !== '' && Aduana !== '0' && Aduana !== ' ' && Aduana !== undefined && Aduana !== null && Patente !== 0 && Pedimento !== 0 && FechaPago !== '' && @@ -1019,7 +1019,7 @@ export default function TraficoCorresponsales (props:IProps) { }else{ if ( IDCorresponsal !== 0 && - Aduana !== 0 && + Aduana !== '' && Aduana !== '0' && Aduana !== ' ' && Aduana !== undefined && Aduana !== null && Patente !== 0 && NoCuenta !== null && TieneArchivoZIPCorresponsal && @@ -1244,7 +1244,7 @@ export default function TraficoCorresponsales (props:IProps) { } function openSOIA() { - let id: number = Aduana ? Aduana : 0 + let id: number = Aduana ? +Aduana : 0 window.open( `https://aplicacionesc.mat.sat.gob.mx/SOIA_CR_WEB/oia_consultarapd_cep.aspx?&pa=${Patente}&dn=${Pedimento}&s=0&ap=${getCurrentYear()}&pad=${Aduana}&ad=${getAduana( id diff --git a/src/Components/Reportes/RptCorresponsalesTraficos.tsx b/src/Components/Reportes/RptCorresponsalesTraficos.tsx index e99a25e..fe8f83d 100644 --- a/src/Components/Reportes/RptCorresponsalesTraficos.tsx +++ b/src/Components/Reportes/RptCorresponsalesTraficos.tsx @@ -86,7 +86,7 @@ export default function RptCorresponsalesTraficos(props: IProps) { //const [Corresponsal, setCorresponsal] = useState(0) const [Pedimento, setPedimento] = useState(0) const [Patente, setPatente] = useState(0); - const [Aduana, setAduana] = useState(0); + const [Aduana, setAduana] = useState('0'); const [Referencia, setReferencia] = useState('') const [Clientes, setClientes] = useState>() const [filtro, setFiltro] = useState('') @@ -326,7 +326,7 @@ export default function RptCorresponsalesTraficos(props: IProps) { Pedimento: Pedimento, Aduana: Aduana, Patente: Patente, - Proceso: Referencia !== '' || Pedimento !== 0 || Aduana !== 0 || Patente !== 0 ? 0 : parseInt(proc.replace('proc=', '')), + Proceso: Referencia !== '' || Pedimento !== 0 || Aduana !== '0' || Patente !== 0 ? 0 : parseInt(proc.replace('proc=', '')), Modo: modo ? parseInt(modo.replace('modo=', '')) : 0, Referencia: Referencia } @@ -599,7 +599,7 @@ export default function RptCorresponsalesTraficos(props: IProps) { type='text' size='sm' placeholder='Aduana' - onChange={(e) => setAduana(+e.target.value)} + onChange={(e) => setAduana(e.target.value === '' ? '0' : e.target.value)} /> diff --git a/src/Components/Reportes/RptCorresponsalesTraficosHst.tsx b/src/Components/Reportes/RptCorresponsalesTraficosHst.tsx index 6bda355..e1e086d 100644 --- a/src/Components/Reportes/RptCorresponsalesTraficosHst.tsx +++ b/src/Components/Reportes/RptCorresponsalesTraficosHst.tsx @@ -58,7 +58,7 @@ export default function RptCorresponsalesTraficosHst (props: IProps) { const [DataCorresponsales, setDataCorresponsales] = useState([]) const [Pedimento, setPedimento] = useState(0) const [Patente, setPatente] = useState(0); - const [Aduana, setAduana] = useState(0); + const [Aduana, setAduana] = useState(''); const [columnDefs] = useState([ { field: 'id', headerName: 'id', width: 70, sortable: true, filter: true }, { diff --git a/src/Components/ReportesClientes/GC50/ReporteGC50.tsx b/src/Components/ReportesClientes/GC50/ReporteGC50.tsx index eb7a313..a6fd420 100644 --- a/src/Components/ReportesClientes/GC50/ReporteGC50.tsx +++ b/src/Components/ReportesClientes/GC50/ReporteGC50.tsx @@ -85,7 +85,7 @@ export const ReporteGC50: React.FC = () => { NoCliente: 0, IdCorresponsal: Corresponsal, Pedimento: 0, - Aduana: 0, + Aduana: '0', Patente: 0, Proceso: 0, Modo: 0, @@ -114,7 +114,7 @@ export const ReporteGC50: React.FC = () => { NoCliente: 0, IdCorresponsal: Corresponsal, Pedimento: 0, - Aduana: 0, + Aduana: '0', Patente: 0, Proceso: 0, Modo: 0, diff --git a/src/DTO/Corresponsales/DTOFiltrosTraficosClientes.ts b/src/DTO/Corresponsales/DTOFiltrosTraficosClientes.ts index 40114f5..a5e42f7 100644 --- a/src/DTO/Corresponsales/DTOFiltrosTraficosClientes.ts +++ b/src/DTO/Corresponsales/DTOFiltrosTraficosClientes.ts @@ -5,7 +5,7 @@ export default interface DTOFiltrosTraficosClientes { NoCliente: number; IdCorresponsal: number; Pedimento: number; - Aduana: number; + Aduana: string; Patente: number; Referencia: string; IdUsuario: number; diff --git a/src/DTO/Corresponsales/DTOPedimentosConsolidados.ts b/src/DTO/Corresponsales/DTOPedimentosConsolidados.ts index bb16859..433cfaf 100644 --- a/src/DTO/Corresponsales/DTOPedimentosConsolidados.ts +++ b/src/DTO/Corresponsales/DTOPedimentosConsolidados.ts @@ -1,7 +1,7 @@ export interface DTOPedimentosConsolidados{ id:number idTrafico: number - aduana: number + aduana: string patente: number pedimento: number clave: string diff --git a/src/DTO/Corresponsales/DTORectificacionHistorico.ts b/src/DTO/Corresponsales/DTORectificacionHistorico.ts index e18ce71..7110368 100644 --- a/src/DTO/Corresponsales/DTORectificacionHistorico.ts +++ b/src/DTO/Corresponsales/DTORectificacionHistorico.ts @@ -2,12 +2,12 @@ export default interface DTORectificacionHistorico { IdTrafico: number, IdUsuario: number, IdPedimento: number, - Aduana: number, + Aduana: string, Patente:number, Pedimento: number, Clave: string, FechaPago: string, - AduanaH: number, + AduanaH: string, PatenteH: number, PedimentoH: number, ClaveH: string, diff --git a/src/DTO/Corresponsales/DTORptCorresponsalesTraficos.ts b/src/DTO/Corresponsales/DTORptCorresponsalesTraficos.ts index 0748cb0..4876da4 100644 --- a/src/DTO/Corresponsales/DTORptCorresponsalesTraficos.ts +++ b/src/DTO/Corresponsales/DTORptCorresponsalesTraficos.ts @@ -5,7 +5,7 @@ export default interface DTORptCorresponsalesTraficos { NoCliente: number; IdCorresponsal: number; Pedimento: number; - Aduana: number; + Aduana: string; Patente: number; Proceso: number; Modo: number; diff --git a/src/DTO/Reportes/GC50/DTOReporteGC50.ts b/src/DTO/Reportes/GC50/DTOReporteGC50.ts index 12d144b..ee0112f 100644 --- a/src/DTO/Reportes/GC50/DTOReporteGC50.ts +++ b/src/DTO/Reportes/GC50/DTOReporteGC50.ts @@ -1,7 +1,7 @@ export interface DTOReporteGC50{ trafico: string; corresponsal: string; - aduana: number; + aduana: string; patente: number; pedimentoCorreponsal: string; pedimentoCorresponsalR1: string; diff --git a/src/Interfaces/Catalogos/ICatCorresponsales.ts b/src/Interfaces/Catalogos/ICatCorresponsales.ts index 807c2ec..6cbec2f 100644 --- a/src/Interfaces/Catalogos/ICatCorresponsales.ts +++ b/src/Interfaces/Catalogos/ICatCorresponsales.ts @@ -2,6 +2,6 @@ export default interface ICatCorresponsales { id: number; nombre: string; patente: number, - aduana: number; + aduana: string; correos: string } \ No newline at end of file diff --git a/src/Interfaces/Corresponsales/ICorresponsalRectificacionHistorico.ts b/src/Interfaces/Corresponsales/ICorresponsalRectificacionHistorico.ts index ed66239..496dfb7 100644 --- a/src/Interfaces/Corresponsales/ICorresponsalRectificacionHistorico.ts +++ b/src/Interfaces/Corresponsales/ICorresponsalRectificacionHistorico.ts @@ -2,7 +2,7 @@ export default interface ICorresponsalRectificacionHistorico { id: number usuario: number idTrafico: number - aduana: number + aduana: string patente: number pedimento: number clave: string diff --git a/src/Interfaces/Corresponsales/ICorresponsalTrafico.ts b/src/Interfaces/Corresponsales/ICorresponsalTrafico.ts index 468241f..1190897 100644 --- a/src/Interfaces/Corresponsales/ICorresponsalTrafico.ts +++ b/src/Interfaces/Corresponsales/ICorresponsalTrafico.ts @@ -12,7 +12,7 @@ export default interface ICorresponsalTrafico { kilos?: number estatus?: number trafico?: string - aduana?: number + aduana?: string patente?: number pedimento?: number clave?: string diff --git a/src/Interfaces/ReportesClientes/IReporteOperacionesNewell.ts b/src/Interfaces/ReportesClientes/IReporteOperacionesNewell.ts index 788d337..534a768 100644 --- a/src/Interfaces/ReportesClientes/IReporteOperacionesNewell.ts +++ b/src/Interfaces/ReportesClientes/IReporteOperacionesNewell.ts @@ -1,5 +1,5 @@ export default interface IReporteOperacionesNewell{ - aduana: number; patente: number; pedimento: number; fechaDeEntrada: string|Date; fechaDePago: string|Date; + aduana: string; patente: number; pedimento: number; fechaDeEntrada: string|Date; fechaDePago: string|Date; valorComercialMxn: number; valorComercialDlls: number; valorAduana: number; clave: string; iva: number; dta: number; prv: number; lgi: number; factura: string; tc: number; proveedor: string; taxId: number; producto: string; gc:number; contenedor: string; cuentaDeGastos: string; razon: string; maniobras: number; diff --git a/src/Services/Corresponsalias/Corresponsales.Trafico.Services.ts b/src/Services/Corresponsalias/Corresponsales.Trafico.Services.ts index 13cc374..c4b9319 100644 --- a/src/Services/Corresponsalias/Corresponsales.Trafico.Services.ts +++ b/src/Services/Corresponsalias/Corresponsales.Trafico.Services.ts @@ -39,7 +39,7 @@ class Corresponsales_Trafico_DataService { return http.get(`Corresponsalias/Traficos/Rectificacion/Historico/Get?IdTrafico=${IdTrafico}`); } - ValidaTraficoDuplicado(aduana: number | undefined, patente: number | undefined, pedimento:number | undefined, IdTrafico: number | undefined){ + ValidaTraficoDuplicado(aduana: string | undefined, patente: number | undefined, pedimento:number | undefined, IdTrafico: number | undefined){ return http.get(`Corresponsalias/Traficos/Duplicado?aduana=${aduana}&patente=${patente}&pedimento=${pedimento}&idTrafico=${IdTrafico}`) } AppendFacturasContenedoresAlen(idTrafico:number, fileId:number){ diff --git a/src/store/features/CatCorresponsales/CatCorresponsalesSlice.ts b/src/store/features/CatCorresponsales/CatCorresponsalesSlice.ts index aadf219..6727d74 100644 --- a/src/store/features/CatCorresponsales/CatCorresponsalesSlice.ts +++ b/src/store/features/CatCorresponsales/CatCorresponsalesSlice.ts @@ -1,6 +1,6 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' import ICatCorresponsales from '../../../Interfaces/Catalogos/ICatCorresponsales'; -const CatCorresponsales: ICatCorresponsales[] = [{id:0, nombre:'-Seleccione-', patente:0, aduana:0, correos:''}] +const CatCorresponsales: ICatCorresponsales[] = [{id:0, nombre:'-Seleccione-', patente:0, aduana:'0', correos:''}] const initialState = { CatCorresponsales } export const CatCorresponsalesSlice = createSlice({ diff --git a/src/store/features/Corresponsales/CorresponsalesTraficoSlice.ts b/src/store/features/Corresponsales/CorresponsalesTraficoSlice.ts index 1fcf51d..4699aaa 100644 --- a/src/store/features/Corresponsales/CorresponsalesTraficoSlice.ts +++ b/src/store/features/Corresponsales/CorresponsalesTraficoSlice.ts @@ -14,7 +14,7 @@ const CorresponsalesTrafico: ICorresponsalTrafico[] = [{ kilos: 0, estatus: 0, trafico: '', - aduana: 0, + aduana: '0', patente: 0, pedimento: 0, clave: '',