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

v 3.5.914: fix reset blocco postazione x FIO e LFM (lasciava troppi blocchi...)

Browse Source
This commit is contained in:
Samuele E. Locatelli
2016-09-14 14:11:47 +02:00
parent 095e5f0e33
commit 8c7d1909dc
23 changed files with 87 additions and 31 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-RT/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW-UT/bin/GMW-UT.dll
BIN
View File
Binary file not shown.
GMW-UT/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/POST_FinitiMult_IN.aspx
+1 -1
View File
@@ -10,7 +10,7 @@
<asp:Content ID="Content2" ContentPlaceHolderID="FeaturedContent" runat="server">
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="MCon" runat="server">
<uc1:mod_selLineaNtDt ID="mod_selLineaNtDt1" runat="server" urlNT="POST_FinitiMult_IN" urlDT="POST_FinitiMult_OUT" tipoInOut="I" preCodLineNT="W25" preCodLineDT="W25" preCodLinea="W25" CodFamLinea="LFM" cssNormal="btn btn-default btn-lg" cssSelected="btn btn-primary btn-lg active" showSelNtDt="true" lemmaSx="Ingresso" lemmaDx="Uscita" cssBtnSx="glyphicon glyphicon-import" cssBtnDx="glyphicon glyphicon-export" />
<uc1:mod_selLineaNtDt ID="mod_selLineaNtDt1" runat="server" urlNT="POST_FinitiMult_IN" urlDT="POST_FinitiMult_OUT" tipoInOut="I" preCodLineNT="W25" preCodLineDT="W25" preCodLinea="W25" CodFamLinea="LFM" resetPostByBlocco="false" cssNormal="btn btn-default btn-lg" cssSelected="btn btn-primary btn-lg active" showSelNtDt="true" lemmaSx="Ingresso" lemmaDx="Uscita" cssBtnSx="glyphicon glyphicon-import" cssBtnDx="glyphicon glyphicon-export" />
<asp:Panel runat="server" ID="pnlAll" CssClass="stileAttesa">
<div class="container-fluid">
<asp:Panel ID="pnlSAO" runat="server" ScrollBars="None" CssClass="nav sidebar ombra" BackColor="#696969">
GMW/POST_FinitiMult_IN.aspx.designer.cs
Generated
-9
View File
@@ -12,15 +12,6 @@ namespace GMW {
public partial class POST_FinitiMult_IN {
/// <summary>
/// dlSelCodBlocco 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.DropDownList dlSelCodBlocco;
/// <summary>
/// mod_selLineaNtDt1 control.
/// </summary>
GMW/POST_FinitiMult_OUT.aspx
+1 -1
View File
@@ -10,7 +10,7 @@
<asp:Content ID="Content2" ContentPlaceHolderID="FeaturedContent" runat="server">
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="MCon" runat="server">
<uc1:mod_selLineaNtDt ID="mod_selLineaNtDt1" runat="server" urlNT="POST_FinitiMult_IN" urlDT="POST_FinitiMult_OUT" tipoInOut="O" preCodLineNT="W25" preCodLineDT="W25" CodFamLinea="LFM" cssNormal="btn btn-default btn-lg" cssSelected="btn btn-primary btn-lg active" showSelNtDt="true" lemmaSx="Ingresso" lemmaDx="Uscita" cssBtnSx="glyphicon glyphicon-import" cssBtnDx="glyphicon glyphicon-export" />
<uc1:mod_selLineaNtDt ID="mod_selLineaNtDt1" runat="server" urlNT="POST_FinitiMult_IN" urlDT="POST_FinitiMult_OUT" tipoInOut="O" preCodLineNT="W25" preCodLineDT="W25" CodFamLinea="LFM" resetPostByBlocco="false" cssNormal="btn btn-default btn-lg" cssSelected="btn btn-primary btn-lg active" showSelNtDt="true" lemmaSx="Ingresso" lemmaDx="Uscita" cssBtnSx="glyphicon glyphicon-import" cssBtnDx="glyphicon glyphicon-export" />
<asp:Panel runat="server" ID="pnlAll" CssClass="stileAttesa">
<div class="container-fluid">
<asp:Panel ID="pnlSAO" runat="server" ScrollBars="None" CssClass="nav sidebar ombra" BackColor="#696969">
GMW/POST_FinitiMult_OUT.aspx.cs
+7 -1
View File
@@ -42,7 +42,13 @@ namespace GMW
private void setTempiAttr()
{
// imposto tempi MIN/MAX attraversamento CERCANDO riga puntuale
DS_magazzino.AnagLineeRow riga = MagClass.magazzino.taAL.getByKey(Postazione.currCodLinea)[0];
DS_magazzino.AnagLineeRow riga = null;
try
{
riga = MagClass.magazzino.taAL.getByKey(Postazione.currCodLinea)[0];
}
catch
{ }
if (riga != null)
{
mod_PostFinMultOUT.minTime = riga.minTime;
GMW/POST_Finiti_IN.aspx
+1 -1
View File
@@ -22,7 +22,7 @@
</asp:ObjectDataSource>
</div>
</div>
<uc1:mod_selLineaNtDt ID="mod_selLineaNtDt1" runat="server" urlNT="POST_Finiti_IN" urlDT="POST_Finiti_OUT" tipoInOut="I" CodFamLinea="FIO" cssNormal="btn btn-default btn-lg" cssSelected="btn btn-primary btn-lg active" showSelNtDt="true" lemmaSx="Ingresso" lemmaDx="Uscita" cssBtnSx="glyphicon glyphicon-import" cssBtnDx="glyphicon glyphicon-export" />
<uc1:mod_selLineaNtDt ID="mod_selLineaNtDt1" runat="server" urlNT="POST_Finiti_IN" urlDT="POST_Finiti_OUT" tipoInOut="I" CodFamLinea="FIO" resetPostByBlocco="false" cssNormal="btn btn-default btn-lg" cssSelected="btn btn-primary btn-lg active" showSelNtDt="true" lemmaSx="Ingresso" lemmaDx="Uscita" cssBtnSx="glyphicon glyphicon-import" cssBtnDx="glyphicon glyphicon-export" />
<asp:Panel runat="server" ID="pnlAll" CssClass="stileAttesa">
<div class="container-fluid">
<asp:Panel ID="pnlSAO" runat="server" ScrollBars="None" CssClass="nav sidebar ombra" BackColor="#696969">
GMW/POST_Finiti_IN.aspx.cs
+3 -2
View File
@@ -155,6 +155,7 @@ namespace GMW
{
// cambio codBlocco x selettore...
mod_selLineaNtDt1.preCodLineNT = dlSelCodBlocco.SelectedValue;
mod_selLineaNtDt1.preCodLineDT = dlSelCodBlocco.SelectedValue;
mod_selLineaNtDt1.preCodLinea = dlSelCodBlocco.SelectedValue;
mod_selLineaNtDt1.doUpdate();
}
@@ -169,7 +170,7 @@ namespace GMW
string answ = "";
try
{
answ = utils.obj.taRTPV.getByPageChiave(user_std.pagCorrente, "CodBlocco" + Postazione.IP)[0].valore;
answ = utils.obj.taRTPV.getByPageChiave(user_std.pagCorrente, "CodBlocco_" + Postazione.IP)[0].valore;
//answ = utils.obj.taRTPV.getByPageChiave(user_std.pagCorrente, "CodBlocco" + Postazione.currCodLinea)[0].valore;
}
catch
@@ -182,7 +183,7 @@ namespace GMW
}
set
{
utils.obj.taRTPV.upsert(user_std.pagCorrente, "CodBlocco" + Postazione.IP, value);
utils.obj.taRTPV.upsert(user_std.pagCorrente, "CodBlocco_" + Postazione.IP, value);
//dlSelCodBlocco.SelectedValue = value;
}
}
GMW/POST_Finiti_OUT.aspx
+1 -1
View File
@@ -22,7 +22,7 @@
</asp:ObjectDataSource>
</div>
</div>
<uc1:mod_selLineaNtDt ID="mod_selLineaNtDt1" runat="server" urlNT="POST_Finiti_IN" urlDT="POST_Finiti_OUT" tipoInOut="O" CodFamLinea="FIO" cssNormal="btn btn-default btn-lg" cssSelected="btn btn-primary btn-lg active" showSelNtDt="true" lemmaSx="Ingresso" lemmaDx="Uscita" cssBtnSx="glyphicon glyphicon-import" cssBtnDx="glyphicon glyphicon-export" />
<uc1:mod_selLineaNtDt ID="mod_selLineaNtDt1" runat="server" urlNT="POST_Finiti_IN" urlDT="POST_Finiti_OUT" tipoInOut="O" CodFamLinea="FIO" resetPostByBlocco="false" cssNormal="btn btn-default btn-lg" cssSelected="btn btn-primary btn-lg active" showSelNtDt="true" lemmaSx="Ingresso" lemmaDx="Uscita" cssBtnSx="glyphicon glyphicon-import" cssBtnDx="glyphicon glyphicon-export" />
<asp:Panel runat="server" ID="pnlAll" CssClass="stileAttesa">
<div class="container-fluid">
<asp:Panel ID="pnlSAO" runat="server" ScrollBars="None" CssClass="nav sidebar ombra" BackColor="#696969">
GMW/POST_Finiti_OUT.aspx.cs
+10 -3
View File
@@ -38,7 +38,13 @@ namespace GMW
private void setTempiAttr()
{
// imposto tempi MIN/MAX attraversamento CERCANDO riga puntuale
DS_magazzino.AnagLineeRow riga = MagClass.magazzino.taAL.getByKey(Postazione.currCodLinea)[0];
DS_magazzino.AnagLineeRow riga = null;
try
{
riga = MagClass.magazzino.taAL.getByKey(Postazione.currCodLinea)[0];
}
catch
{ }
if (riga != null)
{
mod_PostFinMultOUT.minTime = riga.minTime;
@@ -170,6 +176,7 @@ namespace GMW
private void refreshBloccoChild()
{
// cambio codBlocco x selettore...
mod_selLineaNtDt1.preCodLineNT = dlSelCodBlocco.SelectedValue;
mod_selLineaNtDt1.preCodLineDT = dlSelCodBlocco.SelectedValue;
mod_selLineaNtDt1.preCodLinea = dlSelCodBlocco.SelectedValue;
mod_selLineaNtDt1.doUpdate();
@@ -185,7 +192,7 @@ namespace GMW
string answ = "";
try
{
answ = utils.obj.taRTPV.getByPageChiave(user_std.pagCorrente, "CodBlocco" + Postazione.IP)[0].valore;
answ = utils.obj.taRTPV.getByPageChiave(user_std.pagCorrente, "CodBlocco_" + Postazione.IP)[0].valore;
//answ = utils.obj.taRTPV.getByPageChiave(user_std.pagCorrente, "CodBlocco" + Postazione.currCodLinea)[0].valore;
}
catch
@@ -198,7 +205,7 @@ namespace GMW
}
set
{
utils.obj.taRTPV.upsert(user_std.pagCorrente, "CodBlocco" + Postazione.IP, value);
utils.obj.taRTPV.upsert(user_std.pagCorrente, "CodBlocco_" + Postazione.IP, value);
//dlSelCodBlocco.SelectedValue = value;
}
}
GMW/POST_Finiti_OUT.aspx.designer.cs
Generated
+9
View File
@@ -21,6 +21,15 @@ namespace GMW {
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList dlSelCodBlocco;
/// <summary>
/// odsFamLinea 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.ObjectDataSource odsFamLinea;
/// <summary>
/// mod_selLineaNtDt1 control.
/// </summary>
GMW/WebUserControls/mod_selLineaNtDt.ascx
+1
View File
@@ -21,6 +21,7 @@
<asp:TextBox runat="server" ID="txtFormatoDmtx" Visible="false" />
<asp:TextBox runat="server" ID="txtCodFam" Visible="false" />
<asp:TextBox runat="server" ID="txtTipoInOut" Visible="false" />
<asp:TextBox runat="server" ID="txtResetBlocco" Visible="false" />
</div>
<div class="col-sm-4">
<div id="divDtNt" runat="server" class="btn-group" style="width: 100%;">
GMW/WebUserControls/mod_selLineaNtDt.ascx.cs
+40 -8
View File
@@ -165,8 +165,7 @@ namespace GMW.WebUserControls
else
{
// resetto uso postazione...
MagClass.magazzino.taAL.resetPostBlocco(Postazione.name, preCodLinea); // resetto solo x blocco!
//MagClass.magazzino.taAL.resetPost(Postazione.name);
resetPostazione();
}
}
/// <summary>
@@ -268,6 +267,27 @@ namespace GMW.WebUserControls
}
}
/// <summary>
/// determina se deve resettare SOLO BLOCCO o tutto (default=blocco)
/// </summary>
public bool resetPostByBlocco
{
get
{
bool answ = true;
try
{
answ = Convert.ToBoolean(txtResetBlocco.Text);
}
catch
{ }
return answ;
}
set
{
txtResetBlocco.Text = value.ToString();
}
}
/// <summary>
/// valore per filtraggio selezione linee
/// </summary>
public string formatoDmtx
@@ -422,8 +442,7 @@ namespace GMW.WebUserControls
Postazione.currCodCella = "";
Postazione.currNomeLinea = "";
Postazione.currIdxCella = 0;
MagClass.magazzino.taAL.resetPostBlocco(Postazione.name, preCodLinea); // resetto solo x blocco!
//MagClass.magazzino.taAL.resetPost(Postazione.name);
resetPostazione();
}
}
}
@@ -432,8 +451,7 @@ namespace GMW.WebUserControls
Postazione.currCodCella = "";
Postazione.currNomeLinea = "";
Postazione.currIdxCella = 0;
MagClass.magazzino.taAL.resetPostBlocco(Postazione.name, preCodLinea); // resetto solo x blocco!
//MagClass.magazzino.taAL.resetPost(Postazione.name);
resetPostazione();
// mostro errore
Postazione.messaggiText = string.Format("Errore: linea {0} già impegnata, sbloccare postazione o attendere timeout!", codLinea);
Postazione.CssClass = "stileComandoKo";
@@ -445,6 +463,21 @@ namespace GMW.WebUserControls
eh_lineSelected(this, new EventArgs());
}
}
/// <summary>
/// Reset postazione occupata
/// </summary>
private void resetPostazione()
{
if (resetPostByBlocco)
{
MagClass.magazzino.taAL.resetPostBlocco(Postazione.name, preCodLinea); // resetto solo x blocco!
}
else
{
MagClass.magazzino.taAL.resetPost(Postazione.name);
}
}
/// <summary>
/// effettua refresh (su db) del blocco postazione
/// </summary>
@@ -452,8 +485,7 @@ namespace GMW.WebUserControls
public void refreshBloccoPost(string codLinea)
{
// resetto usi linee precedenti..
MagClass.magazzino.taAL.resetPostBlocco(Postazione.name, preCodLinea); // resetto solo x blocco!
//MagClass.magazzino.taAL.resetPost(Postazione.name);
resetPostazione();
if (codLinea != "")
{
// se la linea non è "base" = "Sel linea", finisce x "0"
GMW/WebUserControls/mod_selLineaNtDt.ascx.designer.cs
Generated
+9
View File
@@ -93,6 +93,15 @@ namespace GMW.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtTipoInOut;
/// <summary>
/// txtResetBlocco 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.TextBox txtResetBlocco;
/// <summary>
/// divDtNt control.
/// </summary>
GMW/bin/GMW.dll
BIN
View File
Binary file not shown.
GMW/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/bin/VersGen.dll
BIN
View File
Binary file not shown.
ReleaseClienti/TK_prod/GMW.zip
BIN
View File
Binary file not shown.
ReleaseClienti/TK_test/GMW.zip
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.913.2448")]
[assembly: AssemblyFileVersion("3.5.913.2448")]
[assembly: AssemblyVersion("3.5.914.2448")]
[assembly: AssemblyFileVersion("3.5.914.2448")]
[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.913.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("3.5.913.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("3.5.914.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("3.5.914.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2007-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+