SMS - 2024.02.22 Retro

Os Folio Fiscal Adicional desde inicio y editable en os,
Ventas llevarse campo alfa1 (Folio remisión  es el Folio adicional de la os)

App_Code/ClsOS.vb

@@ -652,7 +652,7 @@ Public Class ClsOS
                                         CveUsuario As Integer, CveEmpresa As Integer, CveCotizacion As Integer, CveVenta As Integer, CveOSPadre As Integer, CveOSTipo As Integer, Optional CveClienteSucursal As Integer = -1,
                                          Optional Direccion As String = "-1", Optional Telefono As String = "", Optional CveModeloAuto As Integer = -1, Optional Año As String = "-1", Optional Correo As String = "",
                                         Optional Condiciones As String = "", Optional CveMedico As Integer = -1, Optional CveProcedimiento As Integer = -1, Optional CveTipoVenta As Integer = -1, Optional FechaCita As DateTime = MinFecha,
-                                        Optional Paciente As String = "-1", Optional IdentificadorCliente As String = "-1") As Boolean
+                                        Optional Paciente As String = "-1", Optional IdentificadorCliente As String = "-1", Optional FolioAdicional As String = "-1") As Boolean
         Dim Retorno As Boolean = False
 
         DataAdapter("PA_OS_OrdenesServiciosAdd")
@@ -686,6 +686,8 @@ Public Class ClsOS
 
             .Add("@Paciente", SqlDbType.VarChar).Value = Paciente
             .Add("@IdentificadorCliente", SqlDbType.VarChar).Value = IdentificadorCliente
+            .Add("@FolioAdicional", SqlDbType.VarChar).Value = FolioAdicional
+
 
             .Add("@CveOS", SqlDbType.Int).Direction = ParameterDirection.Output
             .Add("@vFolio", SqlDbType.Int).Direction = ParameterDirection.Output
@@ -732,7 +734,7 @@ Public Class ClsOS
                                            CveOSTipo As Integer, Optional CveClienteSucursal As Integer = -1, Optional Direccion As String = "-1", Optional Telefono As String = "", Optional CveModeloAuto As Integer = -1,
                                            Optional Año As String = "-1", Optional CveSubProyecto As Integer = -1, Optional Correo As String = "-1", Optional Condiciones As String = "",
                                            Optional CveMedico As Integer = -1, Optional CveProcedimiento As Integer = -1, Optional CveTipoVenta As Integer = -1, Optional FechaCita As DateTime = MinFecha,
-                                           Optional Paciente As String = "-1", Optional IdentificadorCliente As String = "-1") As Boolean
+                                           Optional Paciente As String = "-1", Optional IdentificadorCliente As String = "-1", Optional FolioAdicional As String = "-1") As Boolean
         Dim Retorno As Boolean = False
 
         DataAdapter("PA_OS_OrdenesServiciosUpdate")
@@ -761,6 +763,7 @@ Public Class ClsOS
             .Add("@FechaCita", SqlDbType.DateTime).Value = FechaCita
             .Add("@Paciente", SqlDbType.VarChar).Value = Paciente
             .Add("@IdentificadorCliente", SqlDbType.VarChar).Value = IdentificadorCliente
+            .Add("@FolioAdicional", SqlDbType.VarChar).Value = FolioAdicional
 
         End With
 

App_Code/ClsPaginas.vb

@@ -7020,6 +7020,7 @@ Public Class ClsPaginas
                         params.Add(New ReportParameter("FechaCirugia", Vta.FechaEjecucion.ToString("dd/MM/yyyy HH:mm")))
                         params.Add(New ReportParameter("Paciente", Vta.Paciente))
                         params.Add(New ReportParameter("Episodio", Vta.Episodio))
+                        params.Add(New ReportParameter("Alfa1", Vta.Alfa1))
 
                     End If
                     'VSH

Empresas/186/Formatos/Factura.mrt

@@ -85,7 +85,7 @@
     <Relations isList="true" count="0" />
     <Report isRef="0" />
     <Resources isList="true" count="0" />
-    <Variables isList="true" count="93">
+    <Variables isList="true" count="94">
       <value>ReportParameters,ClienteCodigo,ClienteCodigo,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C__x002F_StiSerializer_x003E_,_x0035_4a879e0a10d464ba2f01e0372efb9ca</value>
       <value>ReportParameters,ClienteTelefono,ClienteTelefono,ReportParameter1,System.String,,False,False,True,False,,_x0036_22a3a61b2f247a6ab5d7dc6c66568db</value>
       <value>ReportParameters,ClienteContacto,ClienteContacto,ReportParameter1,System.String,,False,False,True,False,,_x0035_c52eccfce4d4681a1c62017e690c7c1</value>
@@ -179,6 +179,7 @@
       <value>ReportParameters,FechaCirugia,FechaCirugia,,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_DateTimeType_x003E_DateAndTime_x003C__x002F_DateTimeType_x003E__x003C__x002F_StiSerializer_x003E_,_x0039_11bc963c59b4b6cb4b0ce36a86c40e1</value>
       <value>ReportParameters,Paciente,Paciente,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_DateTimeType_x003E_DateAndTime_x003C__x002F_DateTimeType_x003E__x003C_CheckedColumn_x003E_null_x003B__x003C__x002F_CheckedColumn_x003E__x003C__x002F_StiSerializer_x003E_</value>
       <value>ReportParameters,Episodio,Episodio,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_DateTimeType_x003E_DateAndTime_x003C__x002F_DateTimeType_x003E__x003C_CheckedColumn_x003E_null_x003B__x003C__x002F_CheckedColumn_x003E__x003C__x002F_StiSerializer_x003E_</value>
+      <value>ReportParameters,Alfa1,Alfa1,ReportParameter1,System.String,,False,False,True,False,_x003C__x003F_xml_x0020_version_x003D__x0022_1.0_x0022__x0020_encoding_x003D__x0022_utf-16_x0022__x0020_standalone_x003D__x0022_yes_x0022__x003F__x003E__x003C_StiSerializer_x0020_version_x003D__x0022_1.02_x0022__x0020_type_x003D__x0022_Net_x0022__x0020_application_x003D__x0022_State_x0022__x003E__x003C_SortDirection_x003E_None_x003C__x002F_SortDirection_x003E__x003C_BindingVariable_x0020_isNull_x003D__x0022_true_x0022__x0020__x002F__x003E__x003C_Keys_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_Values_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_CheckedStates_x0020_isList_x003D__x0022_true_x0022__x0020_count_x003D__x0022_0_x0022__x0020__x002F__x003E__x003C_DateTimeType_x003E_DateAndTime_x003C__x002F_DateTimeType_x003E__x003C_CheckedColumn_x003E_null_x003B__x003C__x002F_CheckedColumn_x003E__x003C__x002F_StiSerializer_x003E_</value>
     </Variables>
   </Dictionary>
   <EngineVersion>EngineV2</EngineVersion>
@@ -1488,7 +1489,8 @@ Sello digital  del SAT:
               <Page isRef="7" />
               <Parent isRef="62" />
               <Text>Paciente: {Paciente}
-Episodio: {Episodio}</Text>
+Episodio: {Episodio}
+Folio Remisión: {Alfa1}</Text>
               <TextBrush>Black</TextBrush>
               <Type>Expression</Type>
             </Text9>

OS/OrdenesServicios.aspx

@@ -297,7 +297,7 @@
                                             </div>
 
                                             <div class="col-md-4" style="margin-top: 5px; text-align: left">
-                                               <asp:Label runat="server" ID="LblFolioAdicional"></asp:Label>
+                                               <asp:TextBox runat="server" ID="TxtFolioAdicional" MaxLength="50"></asp:TextBox>
                                             </div>
 
                                             <div class="col-md-2" style="margin-top: 5px">

OS/OrdenesServicios.aspx.vb

@@ -473,7 +473,7 @@ Partial Class OS_OrdenesServicios
                 DVFechaCita2.Visible = True
 
                 DVEpisodioPaciente.Visible = True
-
+                DivFolioAdicional.Visible = True
                 DvTxtPacienteModal.Visible = True
                 DvTxtEpisodioModal.Visible = True
                 DvTxtFolioRemisionModal.Visible = True
@@ -733,8 +733,8 @@ Partial Class OS_OrdenesServicios
 
                 TxtPaciente.Text = ObjOS.Paciente
                 TxtIdentificadorCliente.Text = ObjOS.IdentificadorCliente
-                LblFolioAdicional.Text = ObjOS.FolioAdicional
+                TxtFolioAdicional.Text = ObjOS.FolioAdicional
-                DivFolioAdicional.Visible = If(ObjOS.FolioAdicional.Trim.Length > 0, True, False)
+
 
 
 
@@ -1351,7 +1351,7 @@ Partial Class OS_OrdenesServicios
                                                         UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, CveCotizacion, -1, -1, DdlTipoOrdenOS.SelectedValue.ToEntero, CveClienteSucursal:=DdlSucursalCliente.SelectedValue.ToEntero,
                                                         Direccion:=TxtDireccion.Text, Telefono:=TxtTelefono.Text, CveModeloAuto:=DdlModeloAuto.SelectedValue.ToEntero, Año:=TxtAnio.Text, CveMedico:=DdlMedico.SelectedValue.ToEntero,
                                                         CveProcedimiento:=DdlProcedimiento.SelectedValue.ToEntero, CveTipoVenta:=DdlTipoVenta.SelectedValue.ToEntero, FechaCita:=FechaCita,
-                                                        Paciente:=TxtPaciente.Text.Trim, IdentificadorCliente:=TxtIdentificadorCliente.Text.Trim) Then
+                                                        Paciente:=TxtPaciente.Text.Trim, IdentificadorCliente:=TxtIdentificadorCliente.Text.Trim, FolioAdicional:=TxtFolioAdicional.Text.Trim) Then
                 Errores = True
             End If
             CargaCliente(CveCliente)
@@ -1455,7 +1455,7 @@ Partial Class OS_OrdenesServicios
                                                            DdlTipoOrdenOS.SelectedValue.ToEntero, CveClienteSucursal:=DdlSucursalCliente.SelectedValue.ToEntero, Direccion:=TxtDireccion.Text, Telefono:=TxtTelefono.Text,
                                                            CveModeloAuto:=DdlModeloAuto.SelectedValue.ToEntero, Año:=TxtAnio.Text, CveMedico:=DdlMedico.SelectedValue.ToEntero,
                                                             CveProcedimiento:=DdlProcedimiento.SelectedValue.ToEntero, CveTipoVenta:=DdlTipoVenta.SelectedValue.ToEntero, FechaCita:=FechaCita,
-                                                            Paciente:=TxtPaciente.Text.Trim, IdentificadorCliente:=TxtIdentificadorCliente.Text.Trim) Then
+                                                            Paciente:=TxtPaciente.Text.Trim, IdentificadorCliente:=TxtIdentificadorCliente.Text.Trim, FolioAdicional:=TxtFolioAdicional.Text.Trim) Then
                     For Each Row As DataRow In TmpDT.Rows
                         If Not Errores Then
                             Dim CvePS As Integer = Row("CvePS").ToString.ToEntero
@@ -3037,7 +3037,10 @@ Partial Class OS_OrdenesServicios
 
 
         Select Case DdlTipoVenta.SelectedValue.ToEntero
-            Case 2, 3
+            Case 1, 2
+                Opcion = 1
+                Exit Select
+            Case 3 ' por el momento ya no se usa
                 Opcion = 2
                 Exit Select
             Case 5
@@ -3074,6 +3077,7 @@ Partial Class OS_OrdenesServicios
         If UsuarioActual.Empresa.Funcionalidad(578).ToEntero = 1 Then
             TxtPacienteModal.Text = TxtPaciente.Text
             TxtEpisodioModal.Text = TxtIdentificadorCliente.Text
+            TxtFolioRemisionModal.Text = TxtFolioAdicional.Text
         End If
 
         If DdlTipoVenta.SelectedValue.ToEntero = 5 Then

Ventas/Ventas.aspx.vb

@@ -4936,6 +4936,13 @@ Partial Class Ventas
                     End If
 
                 End If
+
+
+                If UsuarioActual.Empresa.Funcionalidad(578).ToEntero = 1 Then
+                    TxtAlfa1.Text = DbRowVenta("Alfa1").ToString
+                End If
+
+
             End Using
         End If
 
@@ -36588,9 +36595,10 @@ Partial Class Ventas
                 DdlProcedimiento.SelectedValueExist(dRow("CveProcedimiento").ToString.ToEntero)
                 TxtPaciente.Text = dRow("Paciente").ToString
                 TxtEpisodio.Text = dRow("Episodio").ToString
-                SeEstaFActurandoVentaMedica = True
+                TxtAlfa1.Text = dRow("Alfa1").ToString
                 CveTipoVenta = dRow("CveTipoVenta").ToString.ToEntero
                 ChkRequiereTecnico_CheckedChanged(Nothing, Nothing)
+                SeEstaFActurandoVentaMedica = True
             End If
             objVenta.Dispose()
         End If