diff --git a/src/Components/Clientes/Amazon/Components/ComboSelect/ComboDescripcion.tsx b/src/Components/Clientes/Amazon/Components/ComboSelect/ComboDescripcion.tsx index d8ea87d..02b3a9a 100644 --- a/src/Components/Clientes/Amazon/Components/ComboSelect/ComboDescripcion.tsx +++ b/src/Components/Clientes/Amazon/Components/ComboSelect/ComboDescripcion.tsx @@ -26,6 +26,10 @@ export interface IComboDescripcionProps { export function ComboDescripcion(props: IComboDescripcionProps) { const dispatch = useDispatch() + const [Perfil, setPerfil] = useState(() => { + const stickyValue = window.localStorage.getItem('Perfil') + return stickyValue !== null ? JSON.parse(stickyValue) : 0 + }) const mInvoices = useSelector( (state: RootState) => state.AmazonInvoices.Invoice ) @@ -147,15 +151,26 @@ export function ComboDescripcion(props: IComboDescripcionProps) {
changeValidacion(parseInt(e.target.value))} value={Validacion} > - {props.Detail.validaFraccionOriginal===1 ? : '' } - {props.Detail.validaFraccionOriginal===1 ? : ''} + {props.Detail.validaFraccionOriginal <=1 ? ( + + ) : ( + '' + )} + {props.Detail.confirmaDescripcion <= 1 ? ( + + ) : ( + '' + )} - {props.Detail.validaFraccionOriginal===3 ? : ''} + {props.Detail.validaFraccionOriginal === 3 ? ( + + ) : ( + '' + )} { + const stickyValue = window.localStorage.getItem('Perfil') + return stickyValue !== null ? JSON.parse(stickyValue) : 0 + }) const mInvoices = useSelector( (state: RootState) => state.AmazonInvoices.Invoice ) const [Validacion, setValidacion] = useState(props.ConfirmaFraccion) const [UserChanged, setUserChanged] = useState(false) const [showModal, setShowModal] = useState(false) - const [Fraccion, setFraccion] = useState(props.FraccionOriginal) + const [Fraccion, setFraccion] = useState((props.Detail.validaFraccionOriginal==0) ? '' : props.FraccionOriginal) const [header, setHeader] = useState('') const [DescripcionGEMCO, setDescripcionGEMCO] = useState( props.Detail.pedimentoDescription @@ -83,6 +87,7 @@ export function ComboFraccion(props: IComboFraccionProps) { } const UpdateInfo = (newData: I2096Detail) => { + console.log('new data= '+JSON.stringify(newData)) const Invoice = mInvoices .filter((el) => el.id === props.IDInvoice) .map((el) => { @@ -92,10 +97,15 @@ export function ComboFraccion(props: IComboFraccionProps) { if (el.id === props.IDDetail) { return { ...el, - fraccionGEMCO: Fraccion, - descripcionGEMCO: DescripcionGEMCO, + fraccionGEMCO: newData.fraccionGEMCO, + descripcionGEMCO: newData.descripcionGEMCO, autorizado: newData.autorizado, - checked: true + confirmaDescripcion: newData.confirmaDescripcion, + cumplimientoNormativo: newData.cumplimientoNormativo, + comentarios: newData.comentarios, + confirmaFraccion : newData.confirmaFraccion + /*, + checked: true*/ } } return el @@ -128,22 +138,24 @@ export function ComboFraccion(props: IComboFraccionProps) { .catch((e: Error) => { alert('Ocurrio un error' + e.message.toString()) }) */ + // alert(props.Detail.destinationHTSCode+' '+Validacion) setFraccion(props.Detail.destinationHTSCode) - saveFraccion() + saveFraccion(props.Detail.destinationHTSCode) } } }, [Validacion, UserChanged]) - const saveFraccion = () => { + const saveFraccion = (Fracc: string) => { + Fracc=Fracc.replaceAll('.','').replaceAll(' ','') if (Validacion === 2) { - if (CumplimientoNormativo.length === 0) { +/* if (CumplimientoNormativo.length === 0) { setHeader('Error') setMsg( 'Antes de poder guardar la informacion es necesario que proporcione el cumplimiento normativo' ) setShowMsg(true) return - } + } */ if (Comentarios.length === 0) { setHeader('Error') setMsg( @@ -161,12 +173,27 @@ export function ComboFraccion(props: IComboFraccionProps) { return } } - DSAmazon.ValidaFraccionGET(Fraccion) +/* if (Validacion===1) { + setFraccion(props.Detail.destinationHTSCode) + setTimeout(function(){ + console.log("Ready") + }, 3000); + } */ + if (!Fracc) { + setFraccion(Fracc) + alert('La fraccion no puede estar vacia') + return false + } + //alert(Fracc) + DSAmazon.ValidaFraccionGET(Fracc) .then((response) => { if (response.data.respuesta === 'Si') { +/* if (Validacion==1) { + setFraccion(props.Detail.destinationHTSCode) + } */ const data: DTO2096FraccionDescripcion = { id: props.IDDetail, - fraccion: Fraccion, + fraccion: Fracc, cumplimientoNormativo: CumplimientoNormativo, comentarios: Comentarios, descripcionGEMCO: DescripcionGEMCO @@ -198,16 +225,16 @@ export function ComboFraccion(props: IComboFraccionProps) { changeValidacion(parseInt(e.target.value))} value={Validacion} > - {props.Detail.validaFraccionOriginal === 0 ? ( + {props.Detail.validaFraccionOriginal <= 1 ? ( ) : ( '' )} - {props.Detail.validaFraccionOriginal === 1 ? ( + {props.Detail.validaFraccionOriginal <= 1 ? ( ) : ( '' @@ -255,7 +282,6 @@ export function ComboFraccion(props: IComboFraccionProps) { Cumplimiento normativo - {' '} + /* format={'########.##'} */ + value={UnitCost} + displayType={'input'} + style={{ + fontSize: '18px', + backgroundColor: '#F1EEF9', + border: '2px solid #5923F6', + color: '#5923F6', + width: '120px', + textAlign: 'right', + borderRadius: '10px' + }} + /> - - - +   Guardar   +
- */} + { @@ -466,9 +551,7 @@ export default function RtpAmazonInvoice2TrafficDetail( }} size={'sm'} dialogClassName={'modal-50w'} - backdrop="static" - disableEscapeKeyDown={true} - > + >
diff --git a/src/Components/Clientes/Amazon/Services/Amazon.Services.ts b/src/Components/Clientes/Amazon/Services/Amazon.Services.ts index 2a2e6ca..6c9e9d5 100644 --- a/src/Components/Clientes/Amazon/Services/Amazon.Services.ts +++ b/src/Components/Clientes/Amazon/Services/Amazon.Services.ts @@ -14,6 +14,7 @@ import DTO2096LinkInvoice2Reference from '../DTO/DTO2096LinkInvoice2Reference' import DTO2096Estatus from '../DTO/DTO2096Estatus' import DTO2096NoParte from '../DTO/DTO2096NoParte' import I2096NoParteLog from '../Interfaces/I2096NoParteLog' +import DTO2096TraficoFieldsUpdate from '../DTO/DTO2096TraficoFieldsUpdate' class AmazonDataService { AmazonPendingClasificationInvoiceGET() { @@ -134,7 +135,9 @@ class AmazonDataService { AsignaFacturasReferencia(data: DTO2096LinkInvoice2Reference) { return http.post(`/AmazonInvoice/AsignaFacturasReferencia`, data) } - + TrafficFieldsUpdate(data: DTO2096TraficoFieldsUpdate) { + return http.put(`/AmazonInvoice/TrafficFieldsUpdate`, data) + } diff --git a/src/Constants/TargetURL.ts b/src/Constants/TargetURL.ts index 735a218..ede105b 100644 --- a/src/Constants/TargetURL.ts +++ b/src/Constants/TargetURL.ts @@ -4,5 +4,6 @@ export class TargetURL { ? 'https://localhost:5001/api' //: "http://reportes.gemcousa.com:5000/api"; : "https://www.gemcousa.mx/GEMCOBackend/api"; + //: "https://www.alphaomega.com.mx/AOLBackend/api"; } } diff --git a/src/index.tsx b/src/index.tsx index 1f58c3c..1101d92 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -45,7 +45,7 @@ import RtpAmazonFinishedClasificationInvoices from './Components/Clientes/Amazon import { AmazonNoPartes } from './Components/Clientes/Amazon/Reportes/AmazonNoPartes' import { RptAmazonPendingTraficInvoice } from './Components/Clientes/Amazon/Reportes/Traffic/Pending/RtpAmazonPendingTraficInvoice' import { RptAmazonLinkInvoice2Traffic } from './Components/Clientes/Amazon/Reportes/Traffic/Linking/RptAmazonLinkInvoice2Traffic' -import RptPendingAnswerFromAmazon from './Components/Clientes/Amazon/Reportes/Clasification/WaitingAnswer/RptPendingAnswerFromAmazon' +import RptPendingAnswerFromAmazon from './Components/Clientes/Amazon/Reportes/Clasification/WaitingAnswerFromAmazon/RptPendingAnswerFromAmazon' function PageNotFound() { return (