Egalware/GMW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix gestione sblocco UDC trattati

Browse Source
This commit is contained in:
Samuele E. Locatelli
2016-09-13 10:49:59 +02:00
parent 0f7707ae4e
commit 1e5d61e11b
11 changed files with 149 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GMW-RT/bin/GMW-RT.dll
BIN
View File
Binary file not shown.
GMW-UT/bin/GMW-UT.dll
BIN
View File
Binary file not shown.
GMW/SbloccoUdcTrattati.aspx
+4 -4
View File
@@ -11,14 +11,14 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="MCon" runat="server">
<div class="row" style="background-color: #dedede;">
<div class="col-xs-12 text-center">
<div class="col-xs-12 text-center" style="font-size: 2em;">
Linee origine UDC da sbloccare:
<asp:DropDownList runat="server" ID="dlSelCodBlocco" AutoPostBack="true" OnSelectedIndexChanged="dlSelCodBlocco_SelectedIndexChanged">
<asp:ListItem Text="Linee finiti std" Value="W20"></asp:ListItem>
<asp:ListItem Text="Linee GRZ/LVT" Value="W21"></asp:ListItem>
<asp:ListItem Text="Linee FSC" Value="W23"></asp:ListItem>
<asp:ListItem Text="Linee Finiti GRZ/LVT" Value="W21"></asp:ListItem>
<%--<asp:ListItem Text="Linee FSC" Value="W23"></asp:ListItem>--%>
<asp:ListItem Text="Linee Finiti IN/OUT" Value="W24"></asp:ListItem>
<asp:ListItem Text="Linee Finiti Multi IN/OUT" Value="W25"></asp:ListItem>
<asp:ListItem Text="Linee Finiti OLD" Value="W20"></asp:ListItem>
</asp:DropDownList>
</div>
</div>
GMW/SbloccoUdcTrattati.aspx.cs
+3 -2
View File
@@ -22,9 +22,9 @@ namespace GMW
mod_storicoAzioniOperatore1.IdxPosizione2del = memLayer.ML.CRI("IdxPosizioneTrattati");
// pulisco dir temp dai file dei cartellini stampati
reportPrinter.obj.pulisciDir();
// imposto posizione e blocco da web.config
// imposto posizione UDC ingresso ed UDC Veto da web.config (veto = NON devono essere lì eventuali UDC collegati in relazione)
mod_sbloccoUdc.idxPosizioneIn = memLayer.ML.CRI("IdxPosizioneTrattati");
//mod_sbloccoUdc.codBloccoIn = memLayer.ML.CRS("CodBloccoTrattati");
mod_sbloccoUdc.idxPosizioneChildOk = memLayer.ML.CRI("IdxPosizioneFinTemp");
refreshCodBloccoChild();
}
// update vari...
@@ -126,6 +126,7 @@ namespace GMW
protected void dlSelCodBlocco_SelectedIndexChanged(object sender, EventArgs e)
{
refreshCodBloccoChild();
mod_sbloccoUdc.doResetData();
}
private void refreshCodBloccoChild()
GMW/WebUserControls/mod_sbloccoUdc.ascx
+12 -4
View File
@@ -7,10 +7,10 @@
<% } %>
<div class="row">
<div class="col-sm-3 col-lg-2">
<div class="col-sm-2 col-lg-1">
&nbsp;
</div>
<div class="col-sm-6 col-lg-8">
<div class="col-sm-8 col-lg-10">
<div>
<asp:Label runat="server" ID="lblParticolareAttivo" Font-Size="3em" Text="" />
</div>
@@ -54,17 +54,25 @@
<SortedDescendingCellStyle BackColor="#D4DFE1" />
<SortedDescendingHeaderStyle BackColor="#15524A" />
</asp:GridView>
<asp:ObjectDataSource ID="odsUdcSBloccabili" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByCodBlocco" TypeName="GMW_data.DS_magazzinoTableAdapters.v_UdcDetailTableAdapter">
<asp:ObjectDataSource ID="odsUdcSBloccabili" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByCodBlocco" TypeName="GMW_data.DS_magazzinoTableAdapters.v_UdcDetailTableAdapter" FilterExpression="idxPosizione = {0}">
<SelectParameters>
<asp:ControlParameter ControlID="hfCodBlocco" DefaultValue="W00" Name="CodBlocco" Type="String" PropertyName="Value" />
</SelectParameters>
<FilterParameters>
<asp:ControlParameter ControlID="hfIdxPosizione" DefaultValue="0" Name="IdxPosizione" Type="Int32" PropertyName="Value" />
</FilterParameters>
</asp:ObjectDataSource>
<asp:HiddenField runat="server" ID="hfCodBlocco" />
<asp:HiddenField runat="server" ID="hfIdxPosizione" />
<asp:HiddenField runat="server" ID="hfIdxPosizioneChildOk" />
<asp:HiddenField runat="server" ID="hfFlusso" />
<asp:HiddenField runat="server" ID="hfStatoUdc" />
<asp:HiddenField runat="server" ID="hfEvento" />
<br />
</div>
</div>
</div>
<div class="col-sm-3 col-lg-2">
<div class="col-sm-2 col-lg-1">
&nbsp;
</div>
</div>
GMW/WebUserControls/mod_sbloccoUdc.ascx.cs
+81 -6
View File
@@ -14,19 +14,74 @@ namespace GMW.WebUserControls
/// <summary>
/// flusso associato (hard coded) a UDC
/// </summary>
public string flusso = "ND";
public string flusso
{
get
{
return hfFlusso.Value;
}
set
{
hfFlusso.Value = value;
}
}
/// <summary>
/// stato associato (hard coded) a UDC
/// </summary>
public string statoUDC = "ND";
public string statoUDC
{
get
{
return hfStatoUdc.Value;
}
set
{
hfStatoUdc.Value = value;
}
}
/// <summary>
/// tipo di evento associato alla modifica dell'UDC
/// </summary>
public string eventoUDC = "ND";
public string eventoUDC
{
get
{
return hfEvento.Value;
}
set
{
hfEvento.Value = value;
}
}
/// <summary>
/// Posizione di riferimento
/// Posizione di riferimento UDC in ingresso
/// </summary>
public int idxPosizioneIn = 0;
public int idxPosizioneIn
{
get
{
return Convert.ToInt32(hfIdxPosizione.Value);
}
set
{
hfIdxPosizione.Value = value.ToString();
}
}
/// <summary>
/// Posizione PERMESSA per (Eventuali) UDC in relazione a quello di cui si chiede sblocco
/// </summary>
public int idxPosizioneChildOk
{
get
{
return Convert.ToInt32(hfIdxPosizioneChildOk.Value);
}
set
{
hfIdxPosizioneChildOk.Value = value.ToString();
}
}
/// <summary>
/// Cod Blocco di riferimento
/// </summary>
@@ -267,12 +322,32 @@ namespace GMW.WebUserControls
if (codBloccoCurr == codBloccoIn)
{
// controllo abbia 1 sola associazione fusi/sterrato COME CHILD
if (DataProxy.obj.taRelazUDC.stp_getChild(barcodeIn).Rows.Count > 1)
DS_Applicazione.RelazUDCDataTable tabRel = DataProxy.obj.taRelazUDC.stp_getChild(barcodeIn);
if (tabRel.Rows.Count > 1)
{
divSblocca.Visible = false;
Postazione.messaggiText += " - Attenzione, UDC in ingresso associato a più di un UDC in uscita!";
Postazione.CssClass = "stileComandoKo";
}
else if (tabRel.Rows.Count == 1)
{
// controllo che l'UDC EVENTUALMENTE in relazione NON sia in idxPosizVeto
string udcChild = tabRel[0].UDC_child;
DS_magazzino.ElencoCartelliniRow rigaCart = MagClass.magazzino.taCartellini.getByUdc(udcChild)[0];
if (rigaCart.IdxPosizione != idxPosizioneChildOk)
{
divSblocca.Visible = false;
Postazione.messaggiText += string.Format(" - Attenzione, UDC in ingresso associato ad un UDC già stampato! ({0} si trova in posizione {1})", rigaCart.UDC, rigaCart.IdxPosizione);
Postazione.CssClass = "stileComandoKo";
}
else
{
// tutto ok!
currUDC = barcodeIn;
Postazione.CssClass = "stileComandoOk";
divSblocca.Visible = true;
}
}
else
{
currUDC = barcodeIn;
GMW/WebUserControls/mod_sbloccoUdc.ascx.designer.cs
Generated
+45
View File
@@ -119,5 +119,50 @@ namespace GMW.WebUserControls {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfCodBlocco;
/// <summary>
/// hfIdxPosizione control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfIdxPosizione;
/// <summary>
/// hfIdxPosizioneChildOk control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfIdxPosizioneChildOk;
/// <summary>
/// hfFlusso control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfFlusso;
/// <summary>
/// hfStatoUdc control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfStatoUdc;
/// <summary>
/// hfEvento control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfEvento;
}
}
GMW/bin/GMW.dll
BIN
View File
Binary file not shown.
GMW/bin/VersGen.dll
BIN
View File
Binary file not shown.
VersGen/GMW.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("3.5.905.2446")]
[assembly: AssemblyFileVersion("3.5.905.2446")]
[assembly: AssemblyVersion("3.5.906.2447")]
[assembly: AssemblyFileVersion("3.5.906.2447")]
[assembly: AssemblyCopyright("Steamware © 2007-2016")]
[assembly: AssemblyCompany("Steamware")]
VersGen/GMW.tt
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("3.5.905.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("3.5.905.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("3.5.906.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("3.5.906.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2007-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+