diff --git a/Jenkinsfile b/Jenkinsfile index fab47e3..ef5cf8c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=379']) { + withEnv(['NEXT_BUILD_NUMBER=380']) { // env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') diff --git a/NKC_WF/site/PartMIA.aspx.cs b/NKC_WF/site/PartMIA.aspx.cs index 59e2bc5..948ece4 100644 --- a/NKC_WF/site/PartMIA.aspx.cs +++ b/NKC_WF/site/PartMIA.aspx.cs @@ -12,40 +12,17 @@ namespace NKC_WF.site { public partial class PartMIA : BasePage { + #region Protected Fields + /// - /// PackListID richiesta + /// Codice macchina (HARD CODED x ora) /// - protected int PLID - { - get - { - int answ = 0; - try - { - answ = memLayer.ML.QSI("PLID"); - } - catch - { } - return answ; - } - } - /// - /// Cart richiesto - /// - protected int CartID - { - get - { - int answ = 0; - try - { - answ = memLayer.ML.QSI("CartID"); - } - catch - { } - return answ; - } - } + protected string machine = "WRK001"; + + #endregion Protected Fields + + #region Protected Properties + /// /// Bin richiesto /// @@ -63,28 +40,55 @@ namespace NKC_WF.site return answ; } } + /// - /// Codice macchina (HARD CODED x ora) + /// Cart richiesto /// - protected string machine = "WRK001"; - protected void Page_Load(object sender, EventArgs e) + protected int CartID { - if (!Page.IsPostBack) + get { - ((SiteMaster)this.Master).showSearch = true; - doUpdate(); + int answ = 0; + try + { + answ = memLayer.ML.QSI("CartID"); + } + catch + { } + return answ; } - cmp_numRow.eh_doRefresh += cmp_numRow_eh_doRefresh; } - private void cmp_numRow_eh_doRefresh(object sender, EventArgs e) + /// + /// PackListID richiesta + /// + protected int PLID { - cmp_partMIA.numRow = cmp_numRow.numRow; - cmp_partMIA_byPLID.numRow = cmp_numRow.numRow; - cmp_PartMIA_byCartID.numRow = cmp_numRow.numRow; - cmp_PartMIA_byBinID.numRow = cmp_numRow.numRow; + get + { + int answ = 0; + try + { + answ = memLayer.ML.QSI("PLID"); + } + catch + { } + return answ; + } } + protected int savedBatchId + { + get + { + return ComLib.getCurrBatchId(machine); + } + } + + #endregion Protected Properties + + #region Public Properties + /// /// BatchId corrente... /// @@ -93,7 +97,7 @@ namespace NKC_WF.site set { hfBatchID.Value = value.ToString(); - cmp_partMIA.BatchId = BatchId; + cmp_partMIA.BatchId = value; lblBatchId.Text = $"({value})"; lblBatchId.Visible = value > 0; } @@ -104,12 +108,17 @@ namespace NKC_WF.site return answ; } } - protected int savedBatchId + + #endregion Public Properties + + #region Private Methods + + private void cmp_numRow_eh_doRefresh(object sender, EventArgs e) { - get - { - return ComLib.getCurrBatchId(machine); - } + cmp_partMIA.numRow = cmp_numRow.numRow; + cmp_partMIA_byPLID.numRow = cmp_numRow.numRow; + cmp_PartMIA_byCartID.numRow = cmp_numRow.numRow; + cmp_PartMIA_byBinID.numRow = cmp_numRow.numRow; } /// @@ -168,6 +177,21 @@ namespace NKC_WF.site cmp_partMIA.doUpdate(); } } + + #endregion Private Methods + + #region Protected Methods + + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + ((SiteMaster)this.Master).showSearch = true; + doUpdate(); + } + cmp_numRow.eh_doRefresh += cmp_numRow_eh_doRefresh; + } + /// /// Main timer /// @@ -178,5 +202,7 @@ namespace NKC_WF.site // ora faccio verifiche doUpdate(); } + + #endregion Protected Methods } } \ No newline at end of file