Merge branch 'master' of http://oirigoyen@192.168.10.111:8383/SIG.git

Compras/PopUpVerFactura.aspx.vb

@@ -369,9 +369,14 @@ Partial Class PopUpVerFactura
         Dim Envase As String = ""
         Dim Tamano As String = ""
         Dim Cultivo As String = ""
+        Dim Cultivoingles As String = ""
         Dim noPallet As String = ""
         Dim FormatoImpresion As String = ""
-
+        Dim Consecutivo As String = ""
+        Dim Fecha As String = ""
+        Dim NoCajas As String = ""
+        Dim NumberOfCode As String = ""
+        Dim CvetypeImpresion As Integer
         'Envase = "1 1/9"
         'Tamano = "Small"
         'Cultivo = "Tomate"
@@ -382,22 +387,46 @@ Partial Class PopUpVerFactura
                 Envase = row("Envase").ToString()
                 Tamano = row("Tamaño").ToString()
                 Cultivo = row("Cultivo").ToString()
+                Cultivoingles = row("Cultivoingles").ToString()
                 noPallet = row("Codigo").ToString()
                 FormatoImpresion = row("FormatoImpresion").ToString()
+                Consecutivo = row("Consecutivo").ToString()
+                NoCajas = row("NoCajas").ToString()
+                Fecha = String.Format("{0:MMM dd}", row("Fecha")).Replace(".", "").ToUpper()
+                CvetypeImpresion = row("CvetypeImpresion").ToString().ToEntero()
+                NumberOfCode = String.Format("(01)00856977005186(13){0:ddMMyy}(10){0}01", Regex.Match(row("Cuadro").ToString(), "\\d+"), row("Fecha"))
 
             End If
-
         End Using
         Dim params As New List(Of ReportParameter)
-        params.Add(New ReportParameter("Envase", Envase))
         params.Add(New ReportParameter("Tamano", Tamano))
-        params.Add(New ReportParameter("Cultivo", Cultivo))
         params.Add(New ReportParameter("noPallet", noPallet))
         params.Add(New ReportParameter("FormatoImpresion", FormatoImpresion))
+        params.Add(New ReportParameter("Consecutivo", Consecutivo))
+        params.Add(New ReportParameter("Fecha", Fecha))
+        params.Add(New ReportParameter("CveFormato", If(Cultivo.ToLower() = "tomate", "3", CvetypeImpresion.ToString())))
+        params.Add(New ReportParameter("NoCajas", NoCajas))
+        params.Add(New ReportParameter("NumberOfCode", NumberOfCode))
+        params.Add(New ReportParameter("Cultivo", If(CvetypeImpresion = 2, Cultivoingles, Cultivo)))
+        params.Add(New ReportParameter("Envase", If(CvetypeImpresion = 2, "PLU 4062", Envase)))
+
         Dim tablaReporte As New DataTable
+
+
+        tablaReporte.Columns.Add(New DataColumn("Codigo", GetType(String)))
+        tablaReporte.Rows.Add(tablaReporte.NewRow)
+        tablaReporte.Rows.Add(tablaReporte.NewRow)
+
+        Dim lrds As New List(Of ReportDataSource)
+        Dim rds As New ReportDataSource With {.Name = "DataSet1", .Value = tablaReporte}
+        lrds.Add(rds)
         '"Empresas/Grales/Formatos/EquiposGPS.rdlc"
         '"D:\\ADSistemas\\Proyectos\\SIG\\SIGIT\\GPS\\PalletEtiqueta.rdlc"
-        ImprimirPDF("GPS/PalletEtiqueta.rdlc", (New List(Of ReportDataSource)), params, "Pallet Caja")
+        Dim ruta As String = "GPS/PalletEtiquetaCaja.rdlc"
+        'If CvetypeImpresion = 2 Then
+        '    ruta = "GPS/PalletEtiqueta_2.rdlc"
+        'End If
+        ImprimirPDF(ruta, lrds, params, "Pallet Caja")
     End Sub
 #Region "U S U A R I O - T O K E N"
 

GPS/PalletEtiqueta.rdlc

@@ -90,7 +90,13 @@ KM12 HERMOSILLO, SONORA</Value>
                   <Paragraph>
                     <TextRuns>
                       <TextRun>
-                        <Value>SFD-101-00001</Value>
+                        <Value>JAM-101-</Value>
+                        <Style>
+                          <FontWeight>Normal</FontWeight>
+                        </Style>
+                      </TextRun>
+                      <TextRun>
+                        <Value>=Parameters!Consecutivo.Value</Value>
                         <Style>
                           <FontWeight>Normal</FontWeight>
                         </Style>
@@ -481,7 +487,13 @@ KM12 HERMOSILLO, SONORA</Value>
                   <Paragraph>
                     <TextRuns>
                       <TextRun>
-                        <Value>SFD-101-00001</Value>
+                        <Value>JAM-101-</Value>
+                        <Style>
+                          <FontWeight>Normal</FontWeight>
+                        </Style>
+                      </TextRun>
+                      <TextRun>
+                        <Value>=Parameters!Consecutivo.Value</Value>
                         <Style>
                           <FontWeight>Normal</FontWeight>
                         </Style>
@@ -876,7 +888,13 @@ KM12 HERMOSILLO, SONORA</Value>
                   <Paragraph>
                     <TextRuns>
                       <TextRun>
-                        <Value>SFD-101-00001</Value>
+                        <Value>JAM-101-</Value>
+                        <Style>
+                          <FontWeight>Normal</FontWeight>
+                        </Style>
+                      </TextRun>
+                      <TextRun>
+                        <Value>=Parameters!Consecutivo.Value</Value>
                         <Style>
                           <FontWeight>Normal</FontWeight>
                         </Style>
@@ -1268,7 +1286,13 @@ KM12 HERMOSILLO, SONORA</Value>
                   <Paragraph>
                     <TextRuns>
                       <TextRun>
-                        <Value>SFD-101-00001</Value>
+                        <Value>JAM-101-</Value>
+                        <Style>
+                          <FontWeight>Normal</FontWeight>
+                        </Style>
+                      </TextRun>
+                      <TextRun>
+                        <Value>=Parameters!Consecutivo.Value</Value>
                         <Style>
                           <FontWeight>Normal</FontWeight>
                         </Style>
@@ -1626,6 +1650,18 @@ KM12 HERMOSILLO, SONORA</Value>
       <AllowBlank>true</AllowBlank>
       <Prompt>ReportParameter1</Prompt>
     </ReportParameter>
+    <ReportParameter Name="Consecutivo">
+      <DataType>String</DataType>
+      <Nullable>true</Nullable>
+      <AllowBlank>true</AllowBlank>
+      <Prompt>ReportParameter1</Prompt>
+    </ReportParameter>
+    <ReportParameter Name="Fecha">
+      <DataType>String</DataType>
+      <Nullable>true</Nullable>
+      <AllowBlank>true</AllowBlank>
+      <Prompt>ReportParameter1</Prompt>
+    </ReportParameter>
   </ReportParameters>
   <EmbeddedImages>
     <EmbeddedImage Name="logojam">

Scripts/custom.js

@@ -905,9 +905,16 @@ ADSScroll = function (tablescroll) {
         //tablescroll.before(objDiv);
         //objDiv.append(tablescroll);
         if (firsttr) {
+            let childitem = firsttr.find('> td,th').length;
+            let contador =1
             firsttr.find('> td,th').each(function () {
                 var thistd = $(this);
-                trWwidth.append($('<td><div style="width:' + thistd.width() + 'px;"></br></div></td>'))
+                let widthitem = thistd.width();
+                if ((childitem == contador) && widthitem > 0) {
+                    widthitem = widthitem - 10;
+                }
+                trWwidth.append($('<td><div style="width:' + widthitem + 'px;"></br></div></td>'));
+                contador++;
             });
         }
         //objDiv.before(tablescroll);

Sistemas/PopUpCambiaUsuario.aspx

@@ -79,5 +79,18 @@
         }
 
 
+        function gotourl(url) {
+            var reload = window.opener;
+            if (!reload) {
+                reload = parent;
+
+            }
+            if (!url) {
+                url = reload.location.href.replace("#", "");
+            }
+            reload.location = url;
+            window.close();
+
+        }
     </script>
 </asp:Content>

vwd.webinfo

@@ -408,6 +408,8 @@
     
   
     
+  
+