This commit is contained in:
Jorge Luis caudillo esparza
2026-05-20 17:48:48 -07:00
parent 83acc6b4f1
commit ded676ec67
160 changed files with 7680 additions and 4407 deletions

View File

@@ -200,7 +200,7 @@
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4.7.2 %28x86 y x64%29</ProductName>
<ProductName>Microsoft .NET Framework 4.7.2 %28x86 and x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">

View File

@@ -39,7 +39,7 @@ namespace ADSUtileriasService.ChecadorController
try
{
RHSIG rhsig = new RHSIG();
RHSIG rhsig = new RHSIG();
using (SqlLiteBase bd = new SqlLiteBase(""))
{
UtileriasSqlite utilsqlite = new UtileriasSqlite(bd);
@@ -49,13 +49,16 @@ namespace ADSUtileriasService.ChecadorController
Mod.GuardaLog($"Checador Actual {devicemodel.checador} {devicemodel.iPLocal} {devicemodel.puerto} CveChecado: {devicemodel.cveChecador} CveEmpresa:{devicemodel.CveEmpresa} CveSubpryecto:{devicemodel.cveSubProyecto} ", LogsNames.Log);
SDKZkTeckoHelper libvalidacion = new SDKZkTeckoHelper();
/*
//bool conected = libvalidacion.sta_ConnectTCP(devicemodel.iPLocal, devicemodel.puerto, "0") > 0;
if (conected)
List<PersonalChecadorIDResponse> personalsig = new List<PersonalChecadorIDResponse>();
var checks = rhsig.PersonalChecadorID(devicemodel.cveChecador);
if (checks != null)
{
usuariosporvaldar = libvalidacion.GetUserInfo();
libvalidacion.sta_DisConnect();
}*/
personalsig = checks.Result;
}
ADSNetLibrary.SIGAPI.Models.ResponseModel<List<RegistroPersonalChecador>> registros = null;
ADSNetLibrary.SIGAPI.Models.ResponseModel<List<ResponseUser>> users = null;
@@ -94,11 +97,18 @@ namespace ADSUtileriasService.ChecadorController
req.ChecadorID = reg.IdPersonal.ToEntero();
var usuario = usuariosporvaldar.FirstOrDefault(x => x.dwEnrollNumber == reg.IdPersonal);
if (usuario != null) { req.CvePersonal = usuario.sCardnumber.ToEntero(); }
var usuarioz = personalsig.FirstOrDefault(x => x.ChecadorID == reg.IdPersonal);
if (usuarioz != null) { req.CvePersonal = usuarioz.CvePersonal; }
//var usuario = usuariosporvaldar.FirstOrDefault(x => x.dwEnrollNumber == reg.IdPersonal);
//if (usuario != null) { req.CvePersonal = usuario.sCardnumber.ToEntero(); }
req.CveChecador = devicemodel.cveChecador;
req.Fecha = reg.fecha;
registrostosave.Add(req);
if (usuarioz == null || reg.fecha > usuarioz.Fecha)
{
registrostosave.Add(req);
}
//if (reg.fecha > fechac) { fechac = reg.fecha; }
}

View File

@@ -13,9 +13,13 @@ namespace ADSUtileriasService.Conexion.SIG
{
// RouteController ="RH"
public RHSIG(string domainApi = "") : base(domainApi) { }
public ResponseModel<List<ResponseGetPersonal>> GetPersonal(RequestGetPersonal @params)
public ResponseModel<List<ResponseGetPersonal>> GetPersonal(RequestGetPersonal @params)
{
return getData<ResponseModel<List<ResponseGetPersonal>>>("GetPersonal", @params);
return getData<ResponseModel<List<ResponseGetPersonal>>>("GetPersonal", @params);
}
public ResponseModel<List<ResponseGetPersonal>> GetPersonalChecador(RequestGetPersonal @params)
{
return getData<ResponseModel<List<ResponseGetPersonal>>>("GetPersonal", @params);
}
public ResponseModel<List<ResponseGetChecadoresModel>> GetChecadores(RequestGetChecadoresModel @params)
{
@@ -29,7 +33,37 @@ namespace ADSUtileriasService.Conexion.SIG
{
return getData<ResponseModel<bool>>("UpPersonalChecador", @params);
}
public ResponseModel<List<PersonalChecadorIDResponse>> PersonalChecadorID(int CveChecador)
{
return getData<ResponseModel<List<PersonalChecadorIDResponse>>>("PersonalChecadorID", CveChecador);
}
public ResponseModel<bool> AddUpPersonalChecadorVinculo(RequestPersonalChecadorVinculoAddUp request)
{
return getData<ResponseModel<bool>>("AddUpPersonalChecadorVinculo", request);
}
//
}
}
public class PersonalChecadorIDResponse
{
public int CveChecador { get; set; }
public string ChecadorID { get; set; }
public int CvePersonal { get; set; }
public DateTime Fecha { get; set; }
public string Codigo { get; set; }
public string NombreCompleto { get; set; }
}
public class RequestPersonalChecadorVinculoAddUp
{
public int CveEmpresa { get; set; }
public int CveChecador { get; set; }
public string ChecadorID { get; set; } = string.Empty;
public int CvePersonal { get; set; }
public string Checadorname { get; set; } = string.Empty;
}
}

View File

@@ -24,6 +24,10 @@ namespace ADSUtileriasService.Servicios
List<ADSNetLibrary.SIGAPI.Models.RH.Response.ResponseGetPersonal> GETPersonal(int cveSubProyecto, int CveEmpresa = -1);
[OperationContract]
List<ADSNetLibrary.Helpers.Conexiones.ZkTeckoLib.PersonalChecador> GetChecadorEmpleado(int CveChecador, int CveEmpresa = -1);
[OperationContract]
List<PersonalChecadorIDResponse> PersonalChecadorID(int CveChecador);
[OperationContract]
bool SetPersonalChecador(List<ADSNetLibrary.SIGAPI.Models.RH.Request.RequestPersonalChecadorUp> empleados, int CveEmpresa = -1);
[OperationContract]
@@ -45,6 +49,33 @@ namespace ADSUtileriasService.Servicios
}
return retorno.Result;
}
public bool AddUpPersonalChecadorVinculo(RequestPersonalChecadorVinculoAddUp request)
{
Conexion.SIG.RHSIG rhsig = new Conexion.SIG.RHSIG();
var checks = rhsig.AddUpPersonalChecadorVinculo(request);
if (checks != null)
{
return checks.Result;
}
else
{
return false;
}
}
public List<PersonalChecadorIDResponse> PersonalChecadorID(int CveChecador)
{
Conexion.SIG.RHSIG rhsig = new Conexion.SIG.RHSIG();
var checks = rhsig.PersonalChecadorID(CveChecador);
if (checks != null)
{
return checks.Result;
}
else
{
return null;
}
}
public List<ADSNetLibrary.SIGAPI.Models.RH.Response.ResponseGetPersonal> GETPersonal(int cveSubProyecto, int CveEmpresa = -1)
{
ResponseModel<List<ADSNetLibrary.SIGAPI.Models.RH.Response.ResponseGetPersonal>> retorno = new ResponseModel<List<ADSNetLibrary.SIGAPI.Models.RH.Response.ResponseGetPersonal>>();

View File

@@ -1 +1 @@
c72800e780c3d27646b175ff8ce59dff472d4135ea56b14e3810d19fc9e396cf
4901c6b154a5802353aa8ca1769af3cb9b4fe5cf765ecbb7f5d8a0aaabd40213

View File

@@ -18,3 +18,13 @@ C:\Users\caudi\Downloads\Checador\ADSUtileriasWF\bin\Debug\Service\ADSUtileriasS
C:\Users\caudi\Downloads\Checador\ADSUtileriasService\obj\Debug\ADSUtile.DA1283C0.Up2Date
C:\Users\caudi\Downloads\Checador\ADSUtileriasService\obj\Debug\ADSUtileriasService.exe
C:\Users\caudi\Downloads\Checador\ADSUtileriasService\obj\Debug\ADSUtileriasService.pdb
C:\Proyectos\Checador.git\Checador-Desktop\ADSUtileriasService\obj\Debug\ADSUtileriasService.csproj.AssemblyReference.cache
C:\Proyectos\Checador.git\Checador-Desktop\ADSUtileriasService\obj\Debug\ADSUtileriasService.ProjectInstaller.resources
C:\Proyectos\Checador.git\Checador-Desktop\ADSUtileriasService\obj\Debug\ADSUtileriasService.csproj.GenerateResource.cache
C:\Proyectos\Checador.git\Checador-Desktop\ADSUtileriasService\obj\Debug\ADSUtileriasService.csproj.CoreCompileInputs.cache
C:\Proyectos\Checador.git\Checador-Desktop\ADSUtileriasService\obj\Debug\ADSUtileriasService.exe
C:\Proyectos\Checador.git\Checador-Desktop\ADSUtileriasService\obj\Debug\ADSUtileriasService.pdb
C:\Proyectos\Checador.git\Checador-Desktop\ADSUtileriasWF\bin\Debug\Service\ADSUtileriasService.exe.config
C:\Proyectos\Checador.git\Checador-Desktop\ADSUtileriasWF\bin\Debug\Service\ADSUtileriasService.exe
C:\Proyectos\Checador.git\Checador-Desktop\ADSUtileriasWF\bin\Debug\Service\ADSUtileriasService.pdb
C:\Proyectos\Checador.git\Checador-Desktop\ADSUtileriasService\obj\Debug\ADSUtile.DA1283C0.Up2Date

View File

@@ -0,0 +1,106 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
<appSettings>
<add key="aspnet:UseTaskFriendlySynchronizationContext" value="true" />
<add key="UrlApi" value="http://sig.adssistemas.mx:4001/" />
<add key="FilesDir" value="D:\ADSistemas\Proyectos\SIG\ADSUtilerias\FilesDir\" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
<add key="UserName" value="jcaudillo"/>
<add key="Password" value="45makako45"/>
<add key="CveEmpresa" value="119"/>
<add key="actualizarKeyPersonal" value="0"/>
</appSettings>
<system.web>
<compilation debug="true" />
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
</providers>
</roleManager>
</system.web>
<!-- When deploying the service library project, the content of the config file must be added to the host's
app.config file. System.Configuration does not support config files for libraries. -->
<system.serviceModel>
<services>
<service name="ADSUtileriasService.Servicios.Puntoventaservice">
<host>
<baseAddresses>
<add baseAddress="http://localhost:8000/PV/" />
</baseAddresses>
</host>
<endpoint address="" binding="basicHttpBinding" contract="ADSUtileriasService.Servicios.IPuntoventaservice">
<identity>
<dns value="localhost" />
</identity>
</endpoint>
<endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
</service>
<service name="ADSUtileriasService.Servicios.ChecadorService">
<host>
<baseAddresses>
<add baseAddress="http://localhost:8000/Checador/" />
</baseAddresses>
</host>
<endpoint address="" binding="basicHttpBinding" contract="ADSUtileriasService.Servicios.IChecadorService">
<identity>
<dns value="localhost" />
</identity>
</endpoint>
<endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
</service>
<service name="ADSNetLibrary.Application.Servicio.WCF.SystemService">
<host>
<baseAddresses>
<add baseAddress="http://localhost:8000/UtileriasService/" />
</baseAddresses>
</host>
<endpoint address="" binding="basicHttpBinding" contract="ADSNetLibrary.Application.Servicio.WCF.ISystemService">
<identity>
<dns value="localhost" />
</identity>
</endpoint>
<endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
</service>
</services>
<behaviors>
<serviceBehaviors>
<behavior>
<!-- To avoid disclosing metadata information,
set the values below to false before deployment -->
<serviceMetadata httpGetEnabled="True" httpsGetEnabled="True" />
<!-- To receive exception details in faults for debugging purposes,
set the value below to true. Set to false before deployment
to avoid disclosing exception information -->
<serviceDebug includeExceptionDetailInFaults="False" />
</behavior>
</serviceBehaviors>
</behaviors>
</system.serviceModel>
<entityFramework>
<providers>
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
<provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
</providers>
</entityFramework>
<system.data>
<DbProviderFactories>
<remove invariant="System.Data.SQLite.EF6" />
<add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6" />
<remove invariant="System.Data.SQLite" />
<add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".NET Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" />
</DbProviderFactories>
</system.data>
</configuration>

View File

@@ -0,0 +1,106 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
<appSettings>
<add key="aspnet:UseTaskFriendlySynchronizationContext" value="true" />
<add key="UrlApi" value="http://sig.adssistemas.mx:4001/" />
<add key="FilesDir" value="D:\ADSistemas\Proyectos\SIG\ADSUtilerias\FilesDir\" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
<add key="UserName" value="jcaudillo"/>
<add key="Password" value="45makako45"/>
<add key="CveEmpresa" value="119"/>
<add key="actualizarKeyPersonal" value="0"/>
</appSettings>
<system.web>
<compilation debug="true" />
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
</providers>
</roleManager>
</system.web>
<!-- When deploying the service library project, the content of the config file must be added to the host's
app.config file. System.Configuration does not support config files for libraries. -->
<system.serviceModel>
<services>
<service name="ADSUtileriasService.Servicios.Puntoventaservice">
<host>
<baseAddresses>
<add baseAddress="http://localhost:8000/PV/" />
</baseAddresses>
</host>
<endpoint address="" binding="basicHttpBinding" contract="ADSUtileriasService.Servicios.IPuntoventaservice">
<identity>
<dns value="localhost" />
</identity>
</endpoint>
<endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
</service>
<service name="ADSUtileriasService.Servicios.ChecadorService">
<host>
<baseAddresses>
<add baseAddress="http://localhost:8000/Checador/" />
</baseAddresses>
</host>
<endpoint address="" binding="basicHttpBinding" contract="ADSUtileriasService.Servicios.IChecadorService">
<identity>
<dns value="localhost" />
</identity>
</endpoint>
<endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
</service>
<service name="ADSNetLibrary.Application.Servicio.WCF.SystemService">
<host>
<baseAddresses>
<add baseAddress="http://localhost:8000/UtileriasService/" />
</baseAddresses>
</host>
<endpoint address="" binding="basicHttpBinding" contract="ADSNetLibrary.Application.Servicio.WCF.ISystemService">
<identity>
<dns value="localhost" />
</identity>
</endpoint>
<endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
</service>
</services>
<behaviors>
<serviceBehaviors>
<behavior>
<!-- To avoid disclosing metadata information,
set the values below to false before deployment -->
<serviceMetadata httpGetEnabled="True" httpsGetEnabled="True" />
<!-- To receive exception details in faults for debugging purposes,
set the value below to true. Set to false before deployment
to avoid disclosing exception information -->
<serviceDebug includeExceptionDetailInFaults="False" />
</behavior>
</serviceBehaviors>
</behaviors>
</system.serviceModel>
<entityFramework>
<providers>
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
<provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
</providers>
</entityFramework>
<system.data>
<DbProviderFactories>
<remove invariant="System.Data.SQLite.EF6" />
<add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6" />
<remove invariant="System.Data.SQLite" />
<add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".NET Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" />
</DbProviderFactories>
</system.data>
</configuration>