From 13562494c0f76b32bd6e8d5ab15951db73863461 Mon Sep 17 00:00:00 2001
From: JORGE LUIS CAUDILLO ESPARZA <caudillo_90@hotmail.com>
Date: Wed, 8 Jun 2022 05:49:25 -0700
Subject: [PATCH]

---
 App_Code/ClsNominas.vb           | 33 +++++++++++++++++---------------
 GPS/PalletEtiquetaCaja.rdlc      | 24 +++++++++++------------
 Nomina/Finiquito.aspx.cs         |  2 +-
 Nomina/Nomina.aspx.cs            |  4 ++--
 SAT/SolicitudesNominaSat.aspx    |  8 ++++----
 SAT/SolicitudesNominaSat.aspx.cs |  4 ++--
 vwd.webinfo                      |  4 ++++
 7 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/App_Code/ClsNominas.vb b/App_Code/ClsNominas.vb
index b20d213f2..2961cf3d4 100644
--- a/App_Code/ClsNominas.vb
+++ b/App_Code/ClsNominas.vb
@@ -3182,44 +3182,47 @@ Public Class ClsNominas
         Return retorno
     End Function
 #Region "CRUD_SolicitudesNominas"
-    Public Function SolicitudesNominasGet(idSolicitudNominas As Integer, CveEmpresa As Integer) As Boolean
+    Public Function SolicitudesGet(CveSolicitud As Integer, CveEmpresa As Integer, Optional CveTipoSolicitud As Integer = 1) As Boolean
         Dim retorno As Boolean = False
-        DataAdapter("PA_Gral_SAT_SolicitudesNominasGet", CommandType.StoredProcedure)
-        addParameters("@idSolicitudNominas", SqlDbType.Int, idSolicitudNominas)
+        DataAdapter("PA_Gral_SAT_SolicitudesGet", CommandType.StoredProcedure)
+        addParameters("@CveSolicitud", SqlDbType.Int, CveSolicitud)
         addParameters("@CveEmpresa", SqlDbType.Int, CveEmpresa)
+        addParameters("@CveTipoSolicitud", SqlDbType.Int, CveTipoSolicitud)
         retorno = RunQuery("Ocurrió un error al obtener el SolicitudesNominas.")
         Return retorno
     End Function
-    Public Function SolicitudesNominasAdd(idSolicitudCFDI As Integer, idSolicitudMetadata As Integer, estatus As Integer, observaciones As String, fechaInicio As DateTime, fechaFin As DateTime, cveUsuarioIng As Int32, cveEmpresa As Int32) As Boolean
+    Public Function SolicitudesAdd(CveSolicitudCFDI As Integer, CveSolicitudMetadata As Integer, estatus As Integer, observaciones As String, fechaInicio As DateTime, fechaFin As DateTime, cveUsuarioIng As Int32, cveEmpresa As Int32, Optional CveTipoSolicitud As Integer = 1) As Boolean
         Dim retorno As Boolean = False
-        DataAdapter("PA_Gral_SAT_SolicitudesNominasAdd", CommandType.StoredProcedure)
-        addParameters("@idSolicitudCFDI", SqlDbType.Int, idSolicitudCFDI)
-        addParameters("@idSolicitudMetadata", SqlDbType.Int, idSolicitudMetadata)
+        DataAdapter("PA_Gral_SAT_SolicitudesAdd", CommandType.StoredProcedure)
+        addParameters("@CveSolicitudCFDI", SqlDbType.Int, CveSolicitudCFDI)
+        addParameters("@CveSolicitudMetadata", SqlDbType.Int, CveSolicitudMetadata)
         addParameters("@Estatus", SqlDbType.Int, estatus)
         addParameters("@Observaciones", SqlDbType.VarChar, observaciones)
         addParameters("@FechaInicio", SqlDbType.DateTime, fechaInicio)
         addParameters("@FechaFin", SqlDbType.DateTime, fechaFin)
         addParameters("@CveUsuarioIng", SqlDbType.Int, cveUsuarioIng)
         addParameters("@CveEmpresa", SqlDbType.Int, cveEmpresa)
+        addParameters("@CveTipoSolicitud", SqlDbType.Int, CveTipoSolicitud)
+
         retorno = RunQuery("Ocurrió un error al agregar el SolicitudesNominas.")
         Return retorno
     End Function
-    Public Function SolicitudesNominasUp(idSolicitudNominas As Int32, idSolicitudCFDI As Int32, idSolicitudMetadata As Int32, estatus As Int32, observaciones As String, cveEmpresa As Int32) As Boolean
+    Public Function SolicitudesUp(CveSolicitud As Int32, CveSolicitudCFDI As Int32, CveSolicitudMetadata As Int32, estatus As Int32, observaciones As String, cveEmpresa As Int32) As Boolean
         Dim retorno As Boolean = False
-        DataAdapter("PA_Gral_SAT_SolicitudesNominasUp", CommandType.StoredProcedure)
-        addParameters("@idSolicitudNominas", SqlDbType.Int, idSolicitudNominas)
-        addParameters("@idSolicitudCFDI", SqlDbType.Int, idSolicitudCFDI)
-        addParameters("@idSolicitudMetadata", SqlDbType.Int, idSolicitudMetadata)
+        DataAdapter("PA_Gral_SAT_SolicitudesUp", CommandType.StoredProcedure)
+        addParameters("@CveSolicitud", SqlDbType.Int, CveSolicitud)
+        addParameters("@CveSolicitudCFDI", SqlDbType.Int, CveSolicitudCFDI)
+        addParameters("@CveSolicitudMetadata", SqlDbType.Int, CveSolicitudMetadata)
         addParameters("@Estatus", SqlDbType.Int, estatus)
         addParameters("@Observaciones", SqlDbType.VarChar, observaciones)
         addParameters("@CveEmpresa", SqlDbType.Int, cveEmpresa)
         retorno = RunQuery("Ocurrió un error al actualizar el SolicitudesNominas.")
         Return retorno
     End Function
-    Public Function SolicitudesNominasRemove(idSolicitudNominas As Int32, CveEmpresa As Integer) As Boolean
+    Public Function SolicitudesRemove(CveSolicitud As Int32, CveEmpresa As Integer) As Boolean
         Dim retorno As Boolean = False
-        DataAdapter("PA_Gral_SAT_SolicitudesNominasRemove", CommandType.StoredProcedure)
-        addParameters("@idSolicitudNominas", SqlDbType.Int, idSolicitudNominas)
+        DataAdapter("PA_Gral_SAT_SolicitudesRemove", CommandType.StoredProcedure)
+        addParameters("@CveSolicitud", SqlDbType.Int, CveSolicitud)
         addParameters("@CveEmpresa", SqlDbType.Int, CveEmpresa)
         retorno = RunQuery("Ocurrió un error al eliminar el SolicitudesNominas.")
         Return retorno
diff --git a/GPS/PalletEtiquetaCaja.rdlc b/GPS/PalletEtiquetaCaja.rdlc
index eb2d92490..ae3275aed 100644
--- a/GPS/PalletEtiquetaCaja.rdlc
+++ b/GPS/PalletEtiquetaCaja.rdlc
@@ -1311,7 +1311,7 @@ KM12 HERMOSILLO, SONORA</Value>
                   </TablixCells>
                 </TablixRow>
                 <TablixRow>
-                  <Height>0.07938cm</Height>
+                  <Height>0.065cm</Height>
                   <TablixCells>
                     <TablixCell>
                       <CellContents>
@@ -1695,7 +1695,7 @@ KM12 HERMOSILLO, SONORA</Value>
                   </TablixCells>
                 </TablixRow>
                 <TablixRow>
-                  <Height>0.38834cm</Height>
+                  <Height>0.3cm</Height>
                   <TablixCells>
                     <TablixCell>
                       <CellContents>
@@ -1737,7 +1737,7 @@ KM12 HERMOSILLO, SONORA</Value>
                                 <TextRun>
                                   <Value>=Parameters!Envase.Value</Value>
                                   <Style>
-                                    <FontSize>7pt</FontSize>
+                                    <FontSize>6pt</FontSize>
                                     <FontWeight>Normal</FontWeight>
                                   </Style>
                                 </TextRun>
@@ -1757,7 +1757,6 @@ KM12 HERMOSILLO, SONORA</Value>
                           </Style>
                         </Textbox>
                         <ColSpan>4</ColSpan>
-                        <rd:Selected>true</rd:Selected>
                       </CellContents>
                     </TablixCell>
                     <TablixCell />
@@ -1834,7 +1833,7 @@ KM12 HERMOSILLO, SONORA</Value>
                                 <TextRun>
                                   <Value>=Parameters!Envase.Value</Value>
                                   <Style>
-                                    <FontSize>7pt</FontSize>
+                                    <FontSize>6pt</FontSize>
                                     <FontWeight>Normal</FontWeight>
                                   </Style>
                                 </TextRun>
@@ -2132,7 +2131,7 @@ KM12 HERMOSILLO, SONORA</Value>
                                 <TextRun>
                                   <Value>=Parameters!Envase.Value</Value>
                                   <Style>
-                                    <FontSize>7pt</FontSize>
+                                    <FontSize>6pt</FontSize>
                                     <FontWeight>Normal</FontWeight>
                                   </Style>
                                 </TextRun>
@@ -2230,7 +2229,7 @@ KM12 HERMOSILLO, SONORA</Value>
                                 <TextRun>
                                   <Value>=Parameters!Envase.Value</Value>
                                   <Style>
-                                    <FontSize>7pt</FontSize>
+                                    <FontSize>6pt</FontSize>
                                     <FontWeight>Normal</FontWeight>
                                   </Style>
                                 </TextRun>
@@ -2269,7 +2268,7 @@ KM12 HERMOSILLO, SONORA</Value>
                             <Paragraph>
                               <TextRuns>
                                 <TextRun>
-                                  <Value EvaluationMode="Constant">9999C6A22001418</Value>
+                                  <Value>=IIf(Trim(Parameters!Cultivo.Value.ToString())="Tomate","A-201-820-N17","9999C6A22001418")</Value>
                                   <Style>
                                     <FontSize>8pt</FontSize>
                                     <FontWeight>Bold</FontWeight>
@@ -2304,7 +2303,7 @@ KM12 HERMOSILLO, SONORA</Value>
                                 <TextRun>
                                   <Value>=Parameters!Tamano.Value</Value>
                                   <Style>
-                                    <FontSize>7pt</FontSize>
+                                    <FontSize>6pt</FontSize>
                                     <FontWeight>Normal</FontWeight>
                                   </Style>
                                 </TextRun>
@@ -2365,7 +2364,7 @@ KM12 HERMOSILLO, SONORA</Value>
                             <Paragraph>
                               <TextRuns>
                                 <TextRun>
-                                  <Value EvaluationMode="Constant">9999C6A22001418</Value>
+                                  <Value>=IIf(Trim(Parameters!Cultivo.Value.ToString())="Tomate","A-201-820-N17","9999C6A22001418")</Value>
                                   <Style>
                                     <FontSize>8pt</FontSize>
                                     <FontWeight>Bold</FontWeight>
@@ -2385,6 +2384,7 @@ KM12 HERMOSILLO, SONORA</Value>
                           </Style>
                         </Textbox>
                         <ColSpan>3</ColSpan>
+                        <rd:Selected>true</rd:Selected>
                       </CellContents>
                     </TablixCell>
                     <TablixCell />
@@ -2400,7 +2400,7 @@ KM12 HERMOSILLO, SONORA</Value>
                                 <TextRun>
                                   <Value>=Parameters!Tamano.Value</Value>
                                   <Style>
-                                    <FontSize>7pt</FontSize>
+                                    <FontSize>6pt</FontSize>
                                     <FontWeight>Normal</FontWeight>
                                   </Style>
                                 </TextRun>
@@ -3387,7 +3387,7 @@ Produce of MX.</Value>
             <DataSetName>DataSet1</DataSetName>
             <Top>0.00969cm</Top>
             <Left>0.05333cm</Left>
-            <Height>7.23476cm</Height>
+            <Height>7.13204cm</Height>
             <Width>9.75cm</Width>
             <Style>
               <Border>
diff --git a/Nomina/Finiquito.aspx.cs b/Nomina/Finiquito.aspx.cs
index d3a34147c..4fa71bb67 100644
--- a/Nomina/Finiquito.aspx.cs
+++ b/Nomina/Finiquito.aspx.cs
@@ -817,7 +817,7 @@ public partial class Nomina_Finiquito : ClsPaginas
     {
         int SRCvePersonal = this.CvePersonal;
         DataTable dtper = dtConceptos.FiltraParametros("Tipo IN ('P') AND EsPadre = 1 And CveSistema NOT IN(10,11,32) ");
-        DataTable dtded = dtConceptos.FiltraParametros("Tipo IN ('D') AND EsPadre = 1 AND CveSistema  <> 47");
+        DataTable dtded = dtConceptos.FiltraParametros("Tipo IN ('D') AND EsPadre = 1 AND CveSistema  NOT IN( 47,101)");
         double percepcionesindem = 0;
         double deduccionesindem = 0;
         foreach (DataRow row in dtConceptos.FiltraParametros("Tipo IN ('P') AND EsPadre = 1 And CveSistema IN(10,11,32) ").Rows)
diff --git a/Nomina/Nomina.aspx.cs b/Nomina/Nomina.aspx.cs
index 4b7800979..1e33fa2ac 100644
--- a/Nomina/Nomina.aspx.cs
+++ b/Nomina/Nomina.aspx.cs
@@ -3442,7 +3442,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
             urlfile = System.IO.Path.Combine(ModExtensiones.DirectorioBaseEmpresas, "Empresas/Grales/Formatos/SobreRecibo.rdlc");
         }
 
-        ImprimirPDF(urlfile, lrds, parametros, "SobreRecibo", "PDF", null);
+        ImprimirPDF(urlfile, lrds, parametros, "SobreRecibo", "PDF", null,Content_Disposition: "Inline");
     }
     protected void BtnGuardarInfornavit_Click(object sender, EventArgs e)
     {
@@ -6573,7 +6573,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
             urlfile = System.IO.Path.Combine(ModExtensiones.DirectorioBaseEmpresas, "Empresas/Grales/Formatos/SobreRecibo.rdlc");
         }
 
-        ImprimirPDF(urlfile, lrds, parametros, "SobreRecibo", "PDF", null);
+        ImprimirPDF(urlfile, lrds, parametros, "SobreRecibo", "PDF", null, Content_Disposition: "Inline");
     }
     protected void DdlTipoPeriodoSim_SelectedIndexChanged(object sender, EventArgs e)
     {
diff --git a/SAT/SolicitudesNominaSat.aspx b/SAT/SolicitudesNominaSat.aspx
index a4b4fe2d7..b81f4bf1a 100644
--- a/SAT/SolicitudesNominaSat.aspx
+++ b/SAT/SolicitudesNominaSat.aspx
@@ -486,11 +486,11 @@
 
                                 <asp:GridView ID="GVSolicitudesPendientes" runat="server" GridLines="None" CssClass="table table-hover table-striped ScrollAD Widthall" AutoGenerateColumns="False"
                                     ShowHeaderWhenEmpty="true" EmptyDataText="No se encontraron registros"
-                                    DataKeyNames="idSolicitudNominas,idSolicitudCFDI,idSolicitudMetadata,Estatus,Observaciones,FechaInicio,FechaFin,FechaIng,CveUsuarioIng,CveEmpresa">
+                                    DataKeyNames="CveSolicitud,CveSolicitudCFDI,CveSolicitudMetadata,Estatus,Observaciones,FechaInicio,FechaFin,FechaIng,CveUsuarioIng,CveEmpresa">
                                     <columns>
                                         <asp:TemplateField HeaderText="Folio">
                                             <itemtemplate>
-                                                <asp:Label runat="server" Text='<%# Eval("idSolicitudNominas")%>'></asp:Label>
+                                                <asp:Label runat="server" Text='<%# Eval("CveSolicitud")%>'></asp:Label>
                                             </itemtemplate>
                                         </asp:TemplateField>
                                         <asp:TemplateField HeaderText="Fecha Inicio">
@@ -541,11 +541,11 @@
                             <div class="portlet-body nomarginleftright form-horizontal form-row-sepe formnombottom ">
                                 <asp:GridView ID="GVSolicitudesNominas" runat="server" GridLines="None" CssClass="table table-hover table-striped ScrollAD Widthall" AutoGenerateColumns="False"
                                     ShowHeaderWhenEmpty="true" EmptyDataText="No se encontraron registros"
-                                    DataKeyNames="idSolicitudNominas,idSolicitudCFDI,idSolicitudMetadata,Estatus,Observaciones,FechaInicio,FechaFin,FechaIng,CveUsuarioIng,CveEmpresa">
+                                    DataKeyNames="CveSolicitud,idSolicitudCFDI,idSolicitudMetadata,Estatus,Observaciones,FechaInicio,FechaFin,FechaIng,CveUsuarioIng,CveEmpresa">
                                     <columns>
                                         <asp:TemplateField HeaderText="Folio">
                                             <itemtemplate>
-                                                <asp:Label runat="server" Text='<%# Eval("idSolicitudNominas")%>'></asp:Label>
+                                                <asp:Label runat="server" Text='<%# Eval("CveSolicitud")%>'></asp:Label>
                                             </itemtemplate>
                                         </asp:TemplateField>
                                         <asp:TemplateField HeaderText="Fecha Inicio">
diff --git a/SAT/SolicitudesNominaSat.aspx.cs b/SAT/SolicitudesNominaSat.aspx.cs
index 1088d414d..d706cda2b 100644
--- a/SAT/SolicitudesNominaSat.aspx.cs
+++ b/SAT/SolicitudesNominaSat.aspx.cs
@@ -169,7 +169,7 @@ public partial class SAT_SolicitudesNominaSat : ClsPaginas
         using (ClsNominas nom = new ClsNominas())
         {
 
-            if (nom.SolicitudesNominasGet(-1, UsuarioActual.CveEmpresa))
+            if (nom.SolicitudesGet(-1, UsuarioActual.CveEmpresa))
             {
 
                 GVSolicitudesPendientes.DataSource = nom.DtResultados.FiltraParametros("Estatus =0");
@@ -200,7 +200,7 @@ public partial class SAT_SolicitudesNominaSat : ClsPaginas
         bool Continuar = false;
         using (ClsNominas nom = new ClsNominas())
         {
-            Continuar = nom.SolicitudesNominasAdd(idSolicitudCFDI, idSolicitudMetadata, estatus, observaciones, fechaInicio, fechaFin, cveUsuarioIng, cveEmpresa);
+            Continuar = nom.SolicitudesAdd(idSolicitudCFDI, idSolicitudMetadata, estatus, observaciones, fechaInicio, fechaFin, cveUsuarioIng, cveEmpresa);
             var api = new GeneralesAPI();
             api.GeneraSolicitud();
             api.VerificaSolicitudesNominas();
diff --git a/vwd.webinfo b/vwd.webinfo
index 7b3b4fb14..20cfc696e 100644
--- a/vwd.webinfo
+++ b/vwd.webinfo
@@ -496,6 +496,10 @@
     
   
     
+  
+    
+  
+