Merge branch 'develop'
This commit is contained in:
Samuele E. Locatelli
@@ -306,6 +306,13 @@
|
||||
<Compile Include="SMART\login.aspx.designer.cs">
|
||||
<DependentUpon>login.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="SMART\packList.aspx.cs">
|
||||
<DependentUpon>packList.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="SMART\packList.aspx.designer.cs">
|
||||
<DependentUpon>packList.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="SMART\UserAdmin.aspx.cs">
|
||||
<DependentUpon>UserAdmin.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
@@ -590,6 +597,7 @@
|
||||
<Content Include="Reports\queueConf.json" />
|
||||
<Content Include="SMART\Default.aspx" />
|
||||
<Content Include="SMART\login.aspx" />
|
||||
<Content Include="SMART\packList.aspx" />
|
||||
<Content Include="SMART\UserAdmin.aspx" />
|
||||
<Content Include="WebUserControls\cmp_activeParams.ascx" />
|
||||
<Content Include="WebUserControls\cmp_barcode.ascx" />
|
||||
|
||||
@@ -1 +1,3 @@
|
||||
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_dettPedane.ascx.cs" Inherits="MP_MAG.WebUserControls.cmp_dettPedane" %>
|
||||
|
||||
elenco UDC associati
|
||||
+3
-3
@@ -1,10 +1,10 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// <generato automaticamente>
|
||||
// Codice generato da uno strumento.
|
||||
//
|
||||
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
|
||||
// il codice viene rigenerato.
|
||||
// </auto-generated>
|
||||
// il codice viene rigenerato.
|
||||
// </generato automaticamente>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace MP_MAG.WebUserControls
|
||||
|
||||
@@ -7,24 +7,33 @@
|
||||
</div>
|
||||
<div class="card-body py-0">
|
||||
<div class="row table-dark py-1">
|
||||
<div class="col-4">
|
||||
<div class="col-6">
|
||||
<asp:CheckBox runat="server" ID="chkFiltKey" Text="Filtro LDP" AutoPostBack="true" OnCheckedChanged="chkFiltKey_CheckedChanged" />
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<asp:TextBox runat="server" ID="txtKeyFilt" CssClass="form form-control" AutoPostBack="true" OnTextChanged="txtKeyFilt_TextChanged" />
|
||||
</div>
|
||||
<div class="col-3">
|
||||
<asp:LinkButton runat="server" ID="lbtShowAdd" CssClass="btn btn-block btn-warning" OnClick="lbtShowAdd_Click" Text="Aggiungi" />
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<div class="col-2 pr-0">
|
||||
<asp:CheckBox runat="server" ID="chkFiltData" Text="Filtra Data" AutoPostBack="true" OnCheckedChanged="chkFiltData_CheckedChanged" />
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<div class="col-4 pl-0">
|
||||
<asp:TextBox runat="server" ID="txtData" TextMode="Date" CssClass="form-control" OnTextChanged="txtData_TextChanged" AutoPostBack="true" />
|
||||
</div>
|
||||
<div class="col-3">
|
||||
<asp:LinkButton runat="server" ID="lbtPrint" CssClass="btn btn-block btn-primary" OnClick="lbtPrint_Click"><i class="fas fa-print"></i></asp:LinkButton>
|
||||
</div>
|
||||
</div>
|
||||
<div runat="server" id="divAddNew" class="row table-secondary py-1">
|
||||
<div class="col-4">
|
||||
<div class="col-3">
|
||||
Descrizione
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<div class="col-6">
|
||||
<asp:TextBox runat="server" ID="txtDescr" CssClass="form-control" />
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<div class="col-3">
|
||||
<asp:LinkButton runat="server" ID="lbkAddNew" CssClass="btn btn-block btn-success" OnClientClick="return confirm('Creazione nuova pedana: sicuro di voler procedere?');" OnClick="lbkAddNew_Click"><i class="fas fa-plus"></i> ADD</asp:LinkButton>
|
||||
</div>
|
||||
</div>
|
||||
@@ -46,85 +55,53 @@
|
||||
<ItemTemplate>
|
||||
<asp:LinkButton ID="lbtSelect" runat="server" CausesValidation="False" CommandName="Select" CssClass="btn btn-sm btn-info"><i class="fas fa-search"></i></asp:LinkButton>
|
||||
</ItemTemplate>
|
||||
<EditItemTemplate>
|
||||
<asp:LinkButton ID="lbtUpdate" runat="server" CausesValidation="False" CommandName="Update" CssClass="btn btn-sm btn-success"><i class="fas fa-check"></i></asp:LinkButton>
|
||||
</EditItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField HeaderText="LDP" SortExpression="KeyFilt">
|
||||
<EditItemTemplate>
|
||||
<asp:TextBox ID="txtKeyFilt" runat="server" Text='<%# Bind("KeyFilt") %>' />
|
||||
</EditItemTemplate>
|
||||
<ItemTemplate>
|
||||
<asp:LinkButton runat="server" ID="lbtSelFilt" OnClick="lbtSelFilt_Click" CssClass="text-primary" CommandArgument='<%# Eval("KeyFilt") %>'>
|
||||
<asp:Label ID="lblKeyFilt" runat="server" Text='<%# Eval("KeyFilt") %>' />
|
||||
</asp:LinkButton>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:BoundField DataField="AL" HeaderText="AL" ReadOnly="True" SortExpression="AL" />
|
||||
<asp:BoundField DataField="Descr" HeaderText="Descr" SortExpression="Descr" />
|
||||
<asp:BoundField DataField="DtRec" HeaderText="Data" SortExpression="DtRec" DataFormatString="{0:yyyy-MM-dd}" />
|
||||
<asp:BoundField DataField="CodSoggetto" HeaderText="Opr" SortExpression="CodSoggetto" />
|
||||
<asp:BoundField DataField="QtaTot" HeaderText="Qta" SortExpression="QtaTot" DataFormatString="{0:N2}" />
|
||||
<asp:BoundField DataField="NumUdc" HeaderText="# Udc" SortExpression="NumUdc" />
|
||||
<asp:BoundField DataField="DtRec" HeaderText="Data" SortExpression="DtRec" DataFormatString="{0:yyyy-MM-dd}" ReadOnly="true" />
|
||||
<%--<asp:BoundField DataField="CodSoggetto" HeaderText="Opr" SortExpression="CodSoggetto" />--%>
|
||||
<asp:BoundField DataField="QtaTot" HeaderText="Qta" SortExpression="QtaTot" DataFormatString="{0:N2}" ReadOnly="true" />
|
||||
<asp:BoundField DataField="NumUdc" HeaderText="# Udc" SortExpression="NumUdc" ReadOnly="true" />
|
||||
<%--<asp:BoundField DataField="PesoTot" HeaderText="PesoTot" SortExpression="PesoTot" />
|
||||
<asp:BoundField DataField="Tara" HeaderText="Tara" SortExpression="Tara" />--%>
|
||||
</Columns>
|
||||
</asp:GridView>
|
||||
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getBySearch" TypeName="MagData.DS_MagTableAdapters.ElencoALTableAdapter">
|
||||
<SelectParameters>
|
||||
<asp:ControlParameter ControlID="chkFiltData" DefaultValue="0" Name="FiltDate" PropertyName="Checked" Type="Boolean" />
|
||||
<asp:ControlParameter ControlID="txtData" DefaultValue="""" Name="DayRef" PropertyName="Text" Type="DateTime" />
|
||||
<asp:SessionParameter DefaultValue="*" Name="SearchVal" SessionField="valoreSearch" Type="String" />
|
||||
</SelectParameters>
|
||||
</asp:ObjectDataSource>
|
||||
|
||||
<%--<asp:TemplateField ShowHeader="False">
|
||||
<asp:TemplateField ShowHeader="False">
|
||||
<HeaderTemplate>
|
||||
<asp:LinkButton ID="lbtReset" runat="server" OnClick="lbtReset_Click" CssClass="btn btn-sm btn-primary" Visible="true" ToolTip="Reset"><i class="fas fa-sync"></i></asp:LinkButton>
|
||||
</HeaderTemplate>
|
||||
<ItemTemplate>
|
||||
<asp:LinkButton ID="lbtSel" runat="server" CausesValidation="False" CommandName="Select" Text="Seleziona" CssClass="btn btn-sm btn-info"><i class="fas fa-search"></i></asp:LinkButton>
|
||||
<asp:LinkButton ID="lbtEdit" runat="server" CausesValidation="False" CommandName="Edit" CssClass="btn btn-sm btn-info"><i class="fas fa-edit"></i></asp:LinkButton>
|
||||
</ItemTemplate>
|
||||
<EditItemTemplate>
|
||||
<asp:LinkButton ID="lbtCancel" runat="server" CausesValidation="False" CommandName="Cancel" CssClass="btn btn-sm btn-danger"><i class="fas fa-ban"></i></asp:LinkButton>
|
||||
</EditItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:BoundField DataField="Lotto" HeaderText="Lotto" ReadOnly="True" SortExpression="Lotto" />
|
||||
<asp:TemplateField HeaderText="Tipo" SortExpression="TipoLotto">
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="Label3" runat="server" Text='<%# Eval("TipoLotto") %>' ToolTip='<%# Eval("Origine") %>' />
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField HeaderText="Articolo" SortExpression="CodArt">
|
||||
<ItemTemplate>
|
||||
<div class="row">
|
||||
<div class="col-6 font-weight-bold">
|
||||
<asp:Label ID="Label2" runat="server" Text='<%# Eval("CodArt") %>' />
|
||||
</div>
|
||||
<div class="col-6 text-right">
|
||||
<asp:Label ID="Label4" runat="server" Text='<%# Eval("CodArtExt") %>' />
|
||||
</div>
|
||||
<div class="col-12 small">
|
||||
<i>
|
||||
<asp:Label ID="Label5" runat="server" Text='<%# Eval("DescrArt") %>' /></i>
|
||||
</div>
|
||||
</div>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField HeaderText="Cod" SortExpression="CodStato">
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="Label1" runat="server" Text='<%# Eval("CodStato") %>' ToolTip='<%# Eval("DescStato") %>' />
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField HeaderText="Data" SortExpression="DtCrea">
|
||||
<ItemTemplate>
|
||||
<div>
|
||||
<asp:Label ID="Label7" runat="server" Text='<%# Eval("DtCrea", "{0:yyyy.MM.dd}") %>' />
|
||||
</div>
|
||||
<div class="small">
|
||||
<i>
|
||||
<asp:Label ID="Label8" runat="server" Text='<%# Eval("Note") %>' /></i>
|
||||
</div>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField HeaderText="Qta" SortExpression="QtaOrig">
|
||||
<ItemTemplate>
|
||||
<b>
|
||||
<asp:Label ID="Label9" runat="server" Text='<%# Eval("QtaCurr", "{0:N0}") %>' /></b>
|
||||
/
|
||||
<asp:Label ID="Label6" runat="server" Text='<%# Eval("QtaOrig", "{0:N0}") %>' />
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:BoundField DataField="NumUdc" HeaderText="#" SortExpression="NumUdc" />
|
||||
<asp:TemplateField HeaderText="Attivo" SortExpression="Attivo">
|
||||
<ItemTemplate>
|
||||
<asp:CheckBox ID="CheckBox1" runat="server" Checked='<%# Eval("Attivo") %>' Enabled="false" ToolTip='<%# Eval("DtMod", "mod: {0:yyyy.MM.dd HH:mm:ss}") %>' />
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>--%>
|
||||
</Columns>
|
||||
</asp:GridView>
|
||||
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getBySearch" TypeName="MagData.DS_MagTableAdapters.ElencoALTableAdapter" UpdateMethod="updateFilt">
|
||||
<SelectParameters>
|
||||
<asp:ControlParameter ControlID="chkFiltData" DefaultValue="0" Name="FiltDate" PropertyName="Checked" Type="Boolean" />
|
||||
<asp:ControlParameter ControlID="txtData" DefaultValue="" Name="DayRef" PropertyName="Text" Type="DateTime" />
|
||||
<asp:ControlParameter ControlID="txtKeyFilt" DefaultValue="" Name="KeyFilt" PropertyName="Text" Type="String" />
|
||||
<asp:SessionParameter DefaultValue="*" Name="SearchVal" SessionField="valoreSearch" Type="String" />
|
||||
</SelectParameters>
|
||||
<UpdateParameters>
|
||||
<asp:Parameter Name="Original_AL" Type="String" />
|
||||
<asp:Parameter Name="KeyFilt" Type="String" />
|
||||
<asp:Parameter Name="Descr" Type="String" />
|
||||
</UpdateParameters>
|
||||
</asp:ObjectDataSource>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -29,6 +29,8 @@ namespace MP_MAG.WebUserControls
|
||||
grView.PageSize = cmp_numRow.numRow;
|
||||
txtData.Text = $"{DateTime.Today:yyyy-MM-dd}";
|
||||
txtData.Visible = false;
|
||||
txtKeyFilt.Visible = false;
|
||||
txtKeyFilt.Text = "";
|
||||
divAddNew.Visible = false;
|
||||
}
|
||||
cmp_numRow.eh_doRefresh += Cmp_numRow_eh_doRefresh;
|
||||
@@ -103,7 +105,7 @@ namespace MP_MAG.WebUserControls
|
||||
// calcolo quante pedane ho...
|
||||
try
|
||||
{
|
||||
var tabAL = MagDataLayer.man.taEAL.getBySearch(true, DateTime.Today, "*");
|
||||
var tabAL = MagDataLayer.man.taEAL.getBySearch(true, DateTime.Today, "*", "*");
|
||||
newNum = tabAL.Count + 1;
|
||||
}
|
||||
catch
|
||||
@@ -116,5 +118,45 @@ namespace MP_MAG.WebUserControls
|
||||
{
|
||||
grView.DataBind();
|
||||
}
|
||||
/// <summary>
|
||||
/// Avvia stampa report pedana
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void lbtPrint_Click(object sender, EventArgs e)
|
||||
{
|
||||
// lancio il report x la pedana del giorno... filtro è la DATA...
|
||||
}
|
||||
|
||||
protected void txtKeyFilt_TextChanged(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
protected void chkFiltKey_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
txtKeyFilt.Visible = chkFiltKey.Checked;
|
||||
if (!chkFiltKey.Checked)
|
||||
{
|
||||
txtKeyFilt.Text = "";
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// Impostazione filtro
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void lbtSelFilt_Click(object sender, EventArgs e)
|
||||
{
|
||||
try
|
||||
{
|
||||
LinkButton lbtSend = (LinkButton)sender;
|
||||
txtKeyFilt.Visible = true;
|
||||
chkFiltKey.Checked = true;
|
||||
txtKeyFilt.Text = lbtSend.CommandArgument;
|
||||
}
|
||||
catch
|
||||
{ }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -14,6 +14,24 @@ namespace MP_MAG.WebUserControls
|
||||
public partial class cmp_elencoPedane
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// Controllo chkFiltKey.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Campo generato automaticamente.
|
||||
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.CheckBox chkFiltKey;
|
||||
|
||||
/// <summary>
|
||||
/// Controllo txtKeyFilt.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Campo generato automaticamente.
|
||||
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.TextBox txtKeyFilt;
|
||||
|
||||
/// <summary>
|
||||
/// Controllo lbtShowAdd.
|
||||
/// </summary>
|
||||
@@ -41,6 +59,15 @@ namespace MP_MAG.WebUserControls
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.TextBox txtData;
|
||||
|
||||
/// <summary>
|
||||
/// Controllo lbtPrint.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Campo generato automaticamente.
|
||||
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.LinkButton lbtPrint;
|
||||
|
||||
/// <summary>
|
||||
/// Controllo divAddNew.
|
||||
/// </summary>
|
||||
|
||||
Generated
+59
-4
@@ -6223,7 +6223,7 @@ namespace MagData.DS_MagTableAdapters {
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
private void InitCommandCollection() {
|
||||
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3];
|
||||
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4];
|
||||
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
|
||||
this._commandCollection[0].Connection = this.Connection;
|
||||
this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_ElencoAL";
|
||||
@@ -6235,6 +6235,7 @@ namespace MagData.DS_MagTableAdapters {
|
||||
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@FiltDate", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DayRef", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@KeyFilt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SearchVal", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
|
||||
this._commandCollection[2].Connection = this.Connection;
|
||||
@@ -6245,6 +6246,14 @@ namespace MagData.DS_MagTableAdapters {
|
||||
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Flusso", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggetto", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Descr", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand();
|
||||
this._commandCollection[3].Connection = this.Connection;
|
||||
this._commandCollection[3].CommandText = "dbo.stp_EAL_updateFilt";
|
||||
this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure;
|
||||
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_AL", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@KeyFilt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Descr", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
@@ -6275,7 +6284,7 @@ namespace MagData.DS_MagTableAdapters {
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
|
||||
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
|
||||
public virtual DS_Mag.ElencoALDataTable getBySearch(global::System.Nullable<bool> FiltDate, global::System.Nullable<global::System.DateTime> DayRef, string SearchVal) {
|
||||
public virtual DS_Mag.ElencoALDataTable getBySearch(global::System.Nullable<bool> FiltDate, global::System.Nullable<global::System.DateTime> DayRef, string KeyFilt, string SearchVal) {
|
||||
this.Adapter.SelectCommand = this.CommandCollection[1];
|
||||
if ((FiltDate.HasValue == true)) {
|
||||
this.Adapter.SelectCommand.Parameters[1].Value = ((bool)(FiltDate.Value));
|
||||
@@ -6289,11 +6298,17 @@ namespace MagData.DS_MagTableAdapters {
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
|
||||
}
|
||||
if ((SearchVal == null)) {
|
||||
if ((KeyFilt == null)) {
|
||||
this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(SearchVal));
|
||||
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(KeyFilt));
|
||||
}
|
||||
if ((SearchVal == null)) {
|
||||
this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value;
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[4].Value = ((string)(SearchVal));
|
||||
}
|
||||
DS_Mag.ElencoALDataTable dataTable = new DS_Mag.ElencoALDataTable();
|
||||
this.Adapter.Fill(dataTable);
|
||||
@@ -6334,6 +6349,46 @@ namespace MagData.DS_MagTableAdapters {
|
||||
this.Adapter.Fill(dataTable);
|
||||
return dataTable;
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
|
||||
public virtual int updateFilt(string Original_AL, string KeyFilt, string Descr) {
|
||||
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3];
|
||||
if ((Original_AL == null)) {
|
||||
command.Parameters[1].Value = global::System.DBNull.Value;
|
||||
}
|
||||
else {
|
||||
command.Parameters[1].Value = ((string)(Original_AL));
|
||||
}
|
||||
if ((KeyFilt == null)) {
|
||||
command.Parameters[2].Value = global::System.DBNull.Value;
|
||||
}
|
||||
else {
|
||||
command.Parameters[2].Value = ((string)(KeyFilt));
|
||||
}
|
||||
if ((Descr == null)) {
|
||||
command.Parameters[3].Value = global::System.DBNull.Value;
|
||||
}
|
||||
else {
|
||||
command.Parameters[3].Value = ((string)(Descr));
|
||||
}
|
||||
global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
|
||||
if (((command.Connection.State & global::System.Data.ConnectionState.Open)
|
||||
!= global::System.Data.ConnectionState.Open)) {
|
||||
command.Connection.Open();
|
||||
}
|
||||
int returnValue;
|
||||
try {
|
||||
returnValue = command.ExecuteNonQuery();
|
||||
}
|
||||
finally {
|
||||
if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
|
||||
command.Connection.Close();
|
||||
}
|
||||
}
|
||||
return returnValue;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
+20
-6
@@ -360,6 +360,7 @@ FROM v_ElencoAL</CommandText>
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@FiltDate" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@DayRef" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@KeyFilt" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@SearchVal" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
</Parameters>
|
||||
</DbCommand>
|
||||
@@ -379,6 +380,19 @@ FROM v_ElencoAL</CommandText>
|
||||
</DbCommand>
|
||||
</SelectCommand>
|
||||
</DbSource>
|
||||
<DbSource ConnectionRef="MoonPro_MAGConnectionString (Settings)" DbObjectName="MoonPro_MAG.dbo.stp_EAL_updateFilt" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="updateFilt" Modifier="Public" Name="updateFilt" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="updateFilt">
|
||||
<SelectCommand>
|
||||
<DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
|
||||
<CommandText>dbo.stp_EAL_updateFilt</CommandText>
|
||||
<Parameters>
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@Original_AL" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@KeyFilt" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@Descr" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
</Parameters>
|
||||
</DbCommand>
|
||||
</SelectCommand>
|
||||
</DbSource>
|
||||
</Sources>
|
||||
</TableAdapter>
|
||||
</Tables>
|
||||
@@ -389,7 +403,7 @@ FROM v_ElencoAL</CommandText>
|
||||
<xs:element name="DS_Mag" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DS_Mag" msprop:Generator_UserDSName="DS_Mag">
|
||||
<xs:complexType>
|
||||
<xs:choice minOccurs="0" maxOccurs="unbounded">
|
||||
<xs:element name="ElencoLotti" msprop:Generator_TableClassName="ElencoLottiDataTable" msprop:Generator_TableVarName="tableElencoLotti" msprop:Generator_RowChangedName="ElencoLottiRowChanged" msprop:Generator_TablePropName="ElencoLotti" msprop:Generator_RowDeletingName="ElencoLottiRowDeleting" msprop:Generator_RowChangingName="ElencoLottiRowChanging" msprop:Generator_RowEvHandlerName="ElencoLottiRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoLottiRowDeleted" msprop:Generator_RowClassName="ElencoLottiRow" msprop:Generator_UserTableName="ElencoLotti" msprop:Generator_RowEvArgName="ElencoLottiRowChangeEvent">
|
||||
<xs:element name="ElencoLotti" msprop:Generator_TableClassName="ElencoLottiDataTable" msprop:Generator_TableVarName="tableElencoLotti" msprop:Generator_TablePropName="ElencoLotti" msprop:Generator_RowDeletingName="ElencoLottiRowDeleting" msprop:Generator_RowChangingName="ElencoLottiRowChanging" msprop:Generator_RowEvHandlerName="ElencoLottiRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoLottiRowDeleted" msprop:Generator_UserTableName="ElencoLotti" msprop:Generator_RowChangedName="ElencoLottiRowChanged" msprop:Generator_RowEvArgName="ElencoLottiRowChangeEvent" msprop:Generator_RowClassName="ElencoLottiRow">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="Lotto" msprop:Generator_ColumnVarNameInTable="columnLotto" msprop:Generator_ColumnPropNameInRow="Lotto" msprop:Generator_ColumnPropNameInTable="LottoColumn" msprop:Generator_UserColumnName="Lotto">
|
||||
@@ -464,7 +478,7 @@ FROM v_ElencoAL</CommandText>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="ElencoUdc" msprop:Generator_TableClassName="ElencoUdcDataTable" msprop:Generator_TableVarName="tableElencoUdc" msprop:Generator_TablePropName="ElencoUdc" msprop:Generator_RowDeletingName="ElencoUdcRowDeleting" msprop:Generator_RowChangingName="ElencoUdcRowChanging" msprop:Generator_RowEvHandlerName="ElencoUdcRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoUdcRowDeleted" msprop:Generator_UserTableName="ElencoUdc" msprop:Generator_RowChangedName="ElencoUdcRowChanged" msprop:Generator_RowEvArgName="ElencoUdcRowChangeEvent" msprop:Generator_RowClassName="ElencoUdcRow">
|
||||
<xs:element name="ElencoUdc" msprop:Generator_TableClassName="ElencoUdcDataTable" msprop:Generator_TableVarName="tableElencoUdc" msprop:Generator_RowChangedName="ElencoUdcRowChanged" msprop:Generator_TablePropName="ElencoUdc" msprop:Generator_RowDeletingName="ElencoUdcRowDeleting" msprop:Generator_RowChangingName="ElencoUdcRowChanging" msprop:Generator_RowEvHandlerName="ElencoUdcRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoUdcRowDeleted" msprop:Generator_RowClassName="ElencoUdcRow" msprop:Generator_UserTableName="ElencoUdc" msprop:Generator_RowEvArgName="ElencoUdcRowChangeEvent">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="UDC" msprop:Generator_ColumnVarNameInTable="columnUDC" msprop:Generator_ColumnPropNameInRow="UDC" msprop:Generator_ColumnPropNameInTable="UDCColumn" msprop:Generator_UserColumnName="UDC">
|
||||
@@ -619,7 +633,7 @@ FROM v_ElencoAL</CommandText>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="AnagArt" msprop:Generator_TableClassName="AnagArtDataTable" msprop:Generator_TableVarName="tableAnagArt" msprop:Generator_RowChangedName="AnagArtRowChanged" msprop:Generator_TablePropName="AnagArt" msprop:Generator_RowDeletingName="AnagArtRowDeleting" msprop:Generator_RowChangingName="AnagArtRowChanging" msprop:Generator_RowEvHandlerName="AnagArtRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagArtRowDeleted" msprop:Generator_RowClassName="AnagArtRow" msprop:Generator_UserTableName="AnagArt" msprop:Generator_RowEvArgName="AnagArtRowChangeEvent">
|
||||
<xs:element name="AnagArt" msprop:Generator_TableClassName="AnagArtDataTable" msprop:Generator_TableVarName="tableAnagArt" msprop:Generator_TablePropName="AnagArt" msprop:Generator_RowDeletingName="AnagArtRowDeleting" msprop:Generator_RowChangingName="AnagArtRowChanging" msprop:Generator_RowEvHandlerName="AnagArtRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagArtRowDeleted" msprop:Generator_UserTableName="AnagArt" msprop:Generator_RowChangedName="AnagArtRowChanged" msprop:Generator_RowEvArgName="AnagArtRowChangeEvent" msprop:Generator_RowClassName="AnagArtRow">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="CodArt" msprop:Generator_ColumnVarNameInTable="columnCodArt" msprop:Generator_ColumnPropNameInRow="CodArt" msprop:Generator_ColumnPropNameInTable="CodArtColumn" msprop:Generator_UserColumnName="CodArt">
|
||||
@@ -646,7 +660,7 @@ FROM v_ElencoAL</CommandText>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="ODL" msprop:Generator_TableClassName="ODLDataTable" msprop:Generator_TableVarName="tableODL" msprop:Generator_TablePropName="ODL" msprop:Generator_RowDeletingName="ODLRowDeleting" msprop:Generator_RowChangingName="ODLRowChanging" msprop:Generator_RowEvHandlerName="ODLRowChangeEventHandler" msprop:Generator_RowDeletedName="ODLRowDeleted" msprop:Generator_UserTableName="ODL" msprop:Generator_RowChangedName="ODLRowChanged" msprop:Generator_RowEvArgName="ODLRowChangeEvent" msprop:Generator_RowClassName="ODLRow">
|
||||
<xs:element name="ODL" msprop:Generator_TableClassName="ODLDataTable" msprop:Generator_TableVarName="tableODL" msprop:Generator_RowChangedName="ODLRowChanged" msprop:Generator_TablePropName="ODL" msprop:Generator_RowDeletingName="ODLRowDeleting" msprop:Generator_RowChangingName="ODLRowChanging" msprop:Generator_RowEvHandlerName="ODLRowChangeEventHandler" msprop:Generator_RowDeletedName="ODLRowDeleted" msprop:Generator_RowClassName="ODLRow" msprop:Generator_UserTableName="ODL" msprop:Generator_RowEvArgName="ODLRowChangeEvent">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="IdxODL" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnIdxODL" msprop:Generator_ColumnPropNameInRow="IdxODL" msprop:Generator_ColumnPropNameInTable="IdxODLColumn" msprop:Generator_UserColumnName="IdxODL" type="xs:int" />
|
||||
@@ -713,7 +727,7 @@ FROM v_ElencoAL</CommandText>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="Elencopost2Queue" msprop:Generator_TableClassName="Elencopost2QueueDataTable" msprop:Generator_TableVarName="tableElencopost2Queue" msprop:Generator_TablePropName="Elencopost2Queue" msprop:Generator_RowDeletingName="Elencopost2QueueRowDeleting" msprop:Generator_RowChangingName="Elencopost2QueueRowChanging" msprop:Generator_RowEvHandlerName="Elencopost2QueueRowChangeEventHandler" msprop:Generator_RowDeletedName="Elencopost2QueueRowDeleted" msprop:Generator_UserTableName="Elencopost2Queue" msprop:Generator_RowChangedName="Elencopost2QueueRowChanged" msprop:Generator_RowEvArgName="Elencopost2QueueRowChangeEvent" msprop:Generator_RowClassName="Elencopost2QueueRow">
|
||||
<xs:element name="Elencopost2Queue" msprop:Generator_TableClassName="Elencopost2QueueDataTable" msprop:Generator_TableVarName="tableElencopost2Queue" msprop:Generator_RowChangedName="Elencopost2QueueRowChanged" msprop:Generator_TablePropName="Elencopost2Queue" msprop:Generator_RowDeletingName="Elencopost2QueueRowDeleting" msprop:Generator_RowChangingName="Elencopost2QueueRowChanging" msprop:Generator_RowEvHandlerName="Elencopost2QueueRowChangeEventHandler" msprop:Generator_RowDeletedName="Elencopost2QueueRowDeleted" msprop:Generator_RowClassName="Elencopost2QueueRow" msprop:Generator_UserTableName="Elencopost2Queue" msprop:Generator_RowEvArgName="Elencopost2QueueRowChangeEvent">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="CodPost" msprop:Generator_ColumnVarNameInTable="columnCodPost" msprop:Generator_ColumnPropNameInRow="CodPost" msprop:Generator_ColumnPropNameInTable="CodPostColumn" msprop:Generator_UserColumnName="CodPost">
|
||||
@@ -733,7 +747,7 @@ FROM v_ElencoAL</CommandText>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="ElencoAL" msprop:Generator_TableClassName="ElencoALDataTable" msprop:Generator_TableVarName="tableElencoAL" msprop:Generator_TablePropName="ElencoAL" msprop:Generator_RowDeletingName="ElencoALRowDeleting" msprop:Generator_RowChangingName="ElencoALRowChanging" msprop:Generator_RowEvHandlerName="ElencoALRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoALRowDeleted" msprop:Generator_UserTableName="ElencoAL" msprop:Generator_RowChangedName="ElencoALRowChanged" msprop:Generator_RowEvArgName="ElencoALRowChangeEvent" msprop:Generator_RowClassName="ElencoALRow">
|
||||
<xs:element name="ElencoAL" msprop:Generator_TableClassName="ElencoALDataTable" msprop:Generator_TableVarName="tableElencoAL" msprop:Generator_RowChangedName="ElencoALRowChanged" msprop:Generator_TablePropName="ElencoAL" msprop:Generator_RowDeletingName="ElencoALRowDeleting" msprop:Generator_RowChangingName="ElencoALRowChanging" msprop:Generator_RowEvHandlerName="ElencoALRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoALRowDeleted" msprop:Generator_RowClassName="ElencoALRow" msprop:Generator_UserTableName="ElencoAL" msprop:Generator_RowEvArgName="ElencoALRowChangeEvent">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="AL" msprop:Generator_ColumnVarNameInTable="columnAL" msprop:Generator_ColumnPropNameInRow="AL" msprop:Generator_ColumnPropNameInTable="ALColumn" msprop:Generator_UserColumnName="AL">
|
||||
|
||||
+3
-3
@@ -6,12 +6,12 @@
|
||||
</autogenerated>-->
|
||||
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
|
||||
<Shapes>
|
||||
<Shape ID="DesignTable:ElencoLotti" ZOrder="4" X="213" Y="99" Height="595" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="375" />
|
||||
<Shape ID="DesignTable:ElencoLotti" ZOrder="4" X="213" Y="99" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
|
||||
<Shape ID="DesignTable:ElencoUdc" ZOrder="2" X="554" Y="91" Height="411" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
|
||||
<Shape ID="DesignTable:AnagArt" ZOrder="6" X="564" Y="536" Height="204" Width="226" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="99" />
|
||||
<Shape ID="DesignTable:ODL" ZOrder="3" X="885" Y="112" Height="388" Width="213" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
|
||||
<Shape ID="DesignTable:Elencopost2Queue" ZOrder="5" X="1134" Y="210" Height="158" Width="232" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="76" />
|
||||
<Shape ID="DesignTable:ElencoAL" ZOrder="1" X="1129" Y="411" Height="319" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="214" />
|
||||
<Shape ID="DesignTable:Elencopost2Queue" ZOrder="5" X="1134" Y="210" Height="158" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="76" />
|
||||
<Shape ID="DesignTable:ElencoAL" ZOrder="1" X="1129" Y="411" Height="342" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="214" />
|
||||
</Shapes>
|
||||
<Connectors />
|
||||
</DiagramLayout>
|
||||
Reference in New Issue
Block a user