AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Desarrollo2019
2019-08-22 11:30:38 -07:00
parent 69f4a3fbf8 b61c12c3e1
commit 93a3fb9005
12 changed files with 39907 additions and 39875 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Empresas/144/Formatos/Cotizacion.rdlc
View File

@@ -1739,7 +1739,7 @@ Celular: </Value>
</Style> </Style>
</TextRun> </TextRun>
<TextRun> <TextRun>
<Value>=Parameters!VendedorMail.Value</Value> <Value>SERVICIOSESPECIALIZADOSENTI@GMAIL.COM</Value>
<Style> <Style>
<FontFamily>bahnschrift</FontFamily> <FontFamily>bahnschrift</FontFamily>
<FontSize>8pt</FontSize> <FontSize>8pt</FontSize>
@@ -1755,7 +1755,7 @@ Celular: </Value>
<Top>0.86675cm</Top> <Top>0.86675cm</Top>
<Left>0.31387cm</Left> <Left>0.31387cm</Left>
<Height>1.8206cm</Height> <Height>1.8206cm</Height>
<Width>6.29968cm</Width> <Width>7.42333cm</Width>
<ZIndex>8</ZIndex> <ZIndex>8</ZIndex>
<Style> <Style>
<Border> <Border>

2
Empresas/2/Formatos/Factura.rdlc
View File

@@ -198,7 +198,7 @@
<Paragraph> <Paragraph>
<TextRuns> <TextRuns>
<TextRun> <TextRun>
<Value>|www.adsistemas.mx | julian@adsistemas.mx|</Value> <Value>|www.adssistemas.mx | julian@adssistemas.mx|</Value>
<Style> <Style>
<FontFamily>Calibri</FontFamily> <FontFamily>Calibri</FontFamily>
<FontSize>8pt</FontSize> <FontSize>8pt</FontSize>

2
Empresas/70/Formatos/Factura.rdlc
View File

@@ -203,7 +203,7 @@
<Paragraph> <Paragraph>
<TextRuns> <TextRuns>
<TextRun> <TextRun>
<Value>www.adsistemas.mx|facturacion@adssistemas.mx</Value> <Value>www.adssistemas.mx|facturacion@adssistemas.mx</Value>
<Style> <Style>
<FontStyle>Normal</FontStyle> <FontStyle>Normal</FontStyle>
<FontFamily>Calibri</FontFamily> <FontFamily>Calibri</FontFamily>

123
GPS/Shipments.aspx
View File

@@ -8,14 +8,6 @@
display: flex; display: flex;
align-items: center; align-items: center;
} }
#DivShipment {
z-index: 1999;
}
#DivStop {
z-index: 2000;
}
</style> </style>
</asp:Content> </asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="E" runat="Server"> <asp:Content ID="Content3" ContentPlaceHolderID="E" runat="Server">
@@ -257,11 +249,13 @@
<asp:RequiredFieldValidator ID="RFVName" runat="server" ControlToValidate="TxtLocName" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Name''</b> es necesario, por favor ingréselo." ValidationGroup="GrpStop"></asp:RequiredFieldValidator> <asp:RequiredFieldValidator ID="RFVName" runat="server" ControlToValidate="TxtLocName" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Name''</b> es necesario, por favor ingréselo." ValidationGroup="GrpStop"></asp:RequiredFieldValidator>
<label for="<%= TxtLocName.ClientID.ToString()%>">Name:</label> <label for="<%= TxtLocName.ClientID.ToString()%>">Name:</label>
</div> </div>
<form method="post">
<div class="form-group form-md-line-input input-iconright"> <div class="form-group form-md-line-input input-iconright">
<asp:TextBox ID="TxtLocID" CssClass="form-control " runat="server"></asp:TextBox> <asp:TextBox ID="TxtLocID" CssClass="form-control " runat="server"></asp:TextBox>
<asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="TxtLocID" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Location''</b> es necesario, por favor ingréselo." ValidationGroup="GrpStop"></asp:RequiredFieldValidator> <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="TxtLocID" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Location''</b> es necesario, por favor ingréselo." ValidationGroup="GrpStop"></asp:RequiredFieldValidator>
<label for="<%= TxtLocID.ClientID.ToString()%>">Location ID:</label> <label for="<%= TxtLocID.ClientID.ToString()%>">Location ID:</label>
</div> </div>
</form>
<div class="portlet light smmallpadding traspasorow bordered"> <div class="portlet light smmallpadding traspasorow bordered">
<div class="portlet-title"> <div class="portlet-title">
<div class="caption font-green"> <div class="caption font-green">
@@ -306,21 +300,29 @@
<div class="row v-center"> <div class="row v-center">
<label class="col-md-12" style="color: gray">Early Arrival Time:</label> <label class="col-md-12" style="color: gray">Early Arrival Time:</label>
</div> </div>
<div class="input-group input-sm date date-picker " data-date-format="dd/mm/yyyy hh:mm" style="display: inline-block;"> <div class="row">
<div class="col-md-12">
<div class="input-group input-sm date date-picker " data-date-format="dd/mm/yyyy hh:mm">
<asp:TextBox ID="TxtFechaStopI" runat="server" CssClass="form-control input-sm ADDateTimePicker" CausesValidation="true" MaxLength="18" Width="132px "></asp:TextBox> <asp:TextBox ID="TxtFechaStopI" runat="server" CssClass="form-control input-sm ADDateTimePicker" CausesValidation="true" MaxLength="18" Width="132px "></asp:TextBox>
<asp:RequiredFieldValidator ID="RFVFechaIStop" runat="server" ControlToValidate="TxtFechaStopI" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Early Arrival Time''</b> es necesario, por favor seleccione uno." ValidationGroup="GrpStop"></asp:RequiredFieldValidator> <asp:RequiredFieldValidator ID="RFVFechaIStop" runat="server" ControlToValidate="TxtFechaStopI" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Early Arrival Time''</b> es necesario, por favor seleccione uno." ValidationGroup="GrpStop"></asp:RequiredFieldValidator>
<ajax:ValidatorCalloutExtender ID="VCEI" runat="server" HighlightCssClass="vco" TargetControlID="RFVFechaIStop" Width="350px"></ajax:ValidatorCalloutExtender> <ajax:ValidatorCalloutExtender ID="VCEI" runat="server" HighlightCssClass="vco" TargetControlID="RFVFechaIStop" Width="350px"></ajax:ValidatorCalloutExtender>
</div> </div>
</div>
</div>
<br /> <br />
<div class="row v-center"> <div class="row v-center">
<label class="col-md-12" style="color: gray">Late Arrival Time:</label> <label class="col-md-12" style="color: gray">Late Arrival Time:</label>
</div> </div>
<div class="input-group input-sm date date-picker " data-date-format="dd/mm/yyyy hh:mm" style="display: inline-block;"> <div class="row">
<div class="col-md-12">
<div class="input-group input-sm date date-picker " data-date-format="dd/mm/yyyy hh:mm">
<asp:TextBox ID="TxtFechaStopF" runat="server" CssClass="form-control input-sm ADDateTimePicker" CausesValidation="true" MaxLength="18" Width="132px "></asp:TextBox> <asp:TextBox ID="TxtFechaStopF" runat="server" CssClass="form-control input-sm ADDateTimePicker" CausesValidation="true" MaxLength="18" Width="132px "></asp:TextBox>
<asp:RequiredFieldValidator ID="RFVFechaFStop" runat="server" ControlToValidate="TxtFechaStopF" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Late Arrival Time''</b> es necesario, por favor seleccione uno." ValidationGroup="GrpStop"></asp:RequiredFieldValidator> <asp:RequiredFieldValidator ID="RFVFechaFStop" runat="server" ControlToValidate="TxtFechaStopF" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Late Arrival Time''</b> es necesario, por favor seleccione uno." ValidationGroup="GrpStop"></asp:RequiredFieldValidator>
<ajax:ValidatorCalloutExtender ID="VCEF" runat="server" HighlightCssClass="vco" TargetControlID="RFVFechaFStop" Width="350px"></ajax:ValidatorCalloutExtender> <ajax:ValidatorCalloutExtender ID="VCEF" runat="server" HighlightCssClass="vco" TargetControlID="RFVFechaFStop" Width="350px"></ajax:ValidatorCalloutExtender>
</div> </div>
</div> </div>
</div>
</div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group form-md-line-input input-iconright"> <div class="form-group form-md-line-input input-iconright">
<asp:DropDownList ID="DdlStopType" runat="server" Width="100%" CssClass="form-control input-sm select2me"> <asp:DropDownList ID="DdlStopType" runat="server" Width="100%" CssClass="form-control input-sm select2me">
@@ -346,10 +348,17 @@
<asp:RequiredFieldValidator ID="RFVStopRole" runat="server" ControlToValidate="DdlStopRole" InitialValue="-1" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Stop Role''</b> es necesario, por favor ingréselo." ValidationGroup="GrpStop"></asp:RequiredFieldValidator> <asp:RequiredFieldValidator ID="RFVStopRole" runat="server" ControlToValidate="DdlStopRole" InitialValue="-1" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Stop Role''</b> es necesario, por favor ingréselo." ValidationGroup="GrpStop"></asp:RequiredFieldValidator>
<label for="<%= DdlStopRole.ClientID.ToString()%>">Stop Role:</label> <label for="<%= DdlStopRole.ClientID.ToString()%>">Stop Role:</label>
</div> </div>
<div class="row v-center">
<div class="col-md-9">
<div class="form-group form-md-line-input input-iconright"> <div class="form-group form-md-line-input input-iconright">
<asp:TextBox ID="TxtLoc" CssClass="form-control" runat="server"></asp:TextBox> <asp:TextBox ID="TxtLoc" CssClass="form-control" runat="server"></asp:TextBox>
<label for="<%= TxtLoc.ClientID.ToString()%>">Search Location:</label> <label for="<%= TxtLoc.ClientID.ToString()%>">Search Location:</label>
</div> </div>
</div>
<div class="col-md-3 v-center">
<button type="button" class="btn btn-primary" onclick="BtnBuscar();">Buscar</button>
</div>
</div>
<div class="portlet light smmallpadding traspasorow bordered"> <div class="portlet light smmallpadding traspasorow bordered">
<div class="portlet-title"> <div class="portlet-title">
<div class="caption font-green"> <div class="caption font-green">
@@ -510,6 +519,9 @@
var markersEvent = []; var markersEvent = [];
var markerEvent; var markerEvent;
var searchBox;
var searchBoxEvent;
$(document).ready(function () { $(document).ready(function () {
initMap(); initMap();
Sys.Application.add_load(function (s, e) { Sys.Application.add_load(function (s, e) {
@@ -517,9 +529,10 @@
}); });
}); });
$('#DivShipment').on('hidden.bs.modal', function () {
return false; //$("form").submit(function (event) {
}); // event.preventDefault();
//});
function initMap() { function initMap() {
@@ -544,12 +557,60 @@
directionsDisplayEvent.setOptions({ suppressMarkers: true }); directionsDisplayEvent.setOptions({ suppressMarkers: true });
directionsDisplayEvent.setMap(mapEvent); directionsDisplayEvent.setMap(mapEvent);
var searchBox = new google.maps.places.SearchBox(document.getElementById("<%= TxtLoc.ClientID%>")); searchBox = new google.maps.places.SearchBox(document.getElementById("<%= TxtLoc.ClientID%>"));
var searchBoxEvent = new google.maps.places.SearchBox(document.getElementById("<%= TxtLoc2.ClientID%>")); searchBoxEvent = new google.maps.places.SearchBox(document.getElementById("<%= TxtLoc2.ClientID%>"));
$("#<%= TxtLoc.ClientID%>").bind('keypress', function (e) {
if (e.keyCode == 13) {
return false;
}
});
$("#<%= TxtLoc2.ClientID%>").bind('keypress', function (e) {
if (e.keyCode == 13) {
return false;
}
});
searchBox.addListener('places_changed', function () { searchBox.addListener('places_changed', function () {
var places = searchBox.getPlaces(); var places = searchBox.getPlaces();
BuscarDireccion(places);
});
searchBoxEvent.addListener('places_changed', function () {
var places = searchBoxEvent.getPlaces();
if (places.length == 0) {
return;
}
var bounds = new google.maps.LatLngBounds();
places.forEach(function (place) {
if (!place.geometry) {
console.log("Returned place contains no geometry");
return;
}
var lat = place.geometry.location.lat();
var lng = place.geometry.location.lng();
SetMapPinEvent(lat, lng);
});
});
map.addListener('bounds_changed', function () {
searchBox.setBounds(map.getBounds());
});
mapEvent.addListener('bounds_changed', function () {
searchBoxEvent.setBounds(mapEvent.getBounds());
});
}
function BtnBuscar() {
var input = document.getElementById("<%= TxtLoc.ClientID%>");
google.maps.event.trigger(input, 'focus', {});
google.maps.event.trigger(input, 'keydown', { keyCode: 13 });
google.maps.event.trigger(this, 'focus', {});
}
function BuscarDireccion(places) {
if (places.length == 0) { if (places.length == 0) {
return; return;
} }
@@ -602,35 +663,6 @@
map.setCenter(bounds.getCenter()); map.setCenter(bounds.getCenter());
}); });
});
searchBoxEvent.addListener('places_changed', function () {
var places = searchBoxEvent.getPlaces();
if (places.length == 0) {
return;
}
var bounds = new google.maps.LatLngBounds();
places.forEach(function (place) {
if (!place.geometry) {
console.log("Returned place contains no geometry");
return;
}
var lat = place.geometry.location.lat();
var lng = place.geometry.location.lng();
SetMapPinEvent(lat, lng);
});
});
map.addListener('bounds_changed', function () {
searchBox.setBounds(map.getBounds());
});
mapEvent.addListener('bounds_changed', function () {
searchBoxEvent.setBounds(mapEvent.getBounds());
});
} }
function cargapin(lat, lng) { function cargapin(lat, lng) {
setTimeout(function () { SetMapPinEvent(lat, lng) }, 1000); setTimeout(function () { SetMapPinEvent(lat, lng) }, 1000);
@@ -682,6 +714,7 @@
} }
markers = []; markers = [];
} }
function getDirecciones(lat, lng) { function getDirecciones(lat, lng) {
var url = '<%= ClsPaginas.UrlDirecciones%>' + 'nominatim/reverse.php?format=jsonv2&zoom=18&addressdetails=1&lat=' + lat + '&lon=' + lng; var url = '<%= ClsPaginas.UrlDirecciones%>' + 'nominatim/reverse.php?format=jsonv2&zoom=18&addressdetails=1&lat=' + lat + '&lon=' + lng;
$.getJSON(url, function (data) { $.getJSON(url, function (data) {
@@ -693,8 +726,6 @@
$("#<%= TxtState.ClientID%>").val(data.address.state); $("#<%= TxtState.ClientID%>").val(data.address.state);
$("#<%= TxtContry.ClientID%>").val(data.address.country); $("#<%= TxtContry.ClientID%>").val(data.address.country);
$("#<%= TxtPostalCode.ClientID%>").val(data.address.postcode); $("#<%= TxtPostalCode.ClientID%>").val(data.address.postcode);
$('#DivShipment').modal({ backdrop: 'static', keyboard: false });
} }
}); });
} }

5
Inventarios/RecepcionEntrega.aspx.vb
View File

@@ -1311,9 +1311,8 @@ Partial Class Inventarios_RecepcionEntrega
Dim TxtCantidad = GvDatos.Rows(Gvr.RowIndex).FCTextBox("TbCantidadF") Dim TxtCantidad = GvDatos.Rows(Gvr.RowIndex).FCTextBox("TbCantidadF")
If Gvr.DataKey("CantidadF").ToDecimal - TxtCantidad.Text.ToDecimal - 1 >= 0 Then If Gvr.DataKey("CantidadF").ToDecimal - TxtCantidad.Text.ToDecimal - 1 >= 0 Then
''VALIDA EXISTENCIA ''VALIDA EXISTENCIA
If Not TipoDocto.Contiene("Dev") Then
If TipoMovimiento = 1 Then If TipoMovimiento = 1 Then
Dim ObjInventario As New ClsInventarios Dim ObjInventario As New ClsInventarios
Dim Existencia = ObjInventario.GetExistenciasPS(Gvr.DataKey("CvePS").ToString.ToEntero, Gvr.DataKey("CveUM").ToString.ToEntero, UsuarioActual.CveEmpresa, DdlAlmacen.SelectedValue.ToEntero, FechaMovto:=TxtFecha.Text.ToDateTime.ToString("yyyy/MM/dd HH:mm"), CveVendedor:=CveVendedor, CveSubProyecto:=CveSubProyecto, CveCliente:=If(UsuarioActual.Empresa.Funcionalidad(146) = "1", -1, CveCliente), ExcluyeApartados:=If(TipoEntrega = 2, 1, -1)) Dim Existencia = ObjInventario.GetExistenciasPS(Gvr.DataKey("CvePS").ToString.ToEntero, Gvr.DataKey("CveUM").ToString.ToEntero, UsuarioActual.CveEmpresa, DdlAlmacen.SelectedValue.ToEntero, FechaMovto:=TxtFecha.Text.ToDateTime.ToString("yyyy/MM/dd HH:mm"), CveVendedor:=CveVendedor, CveSubProyecto:=CveSubProyecto, CveCliente:=If(UsuarioActual.Empresa.Funcionalidad(146) = "1", -1, CveCliente), ExcluyeApartados:=If(TipoEntrega = 2, 1, -1))
@@ -1335,6 +1334,8 @@ Partial Class Inventarios_RecepcionEntrega
End If End If
End If End If
End If End If
End If
If Gvr.DataKey("AplicaSerieLote") = "True" Then If Gvr.DataKey("AplicaSerieLote") = "True" Then
TdSeriePS.Visible = True TdSeriePS.Visible = True