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

Merge branch 'develop' into SDK

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-10-28 16:02:00 +01:00
parent 65ae8fc4cd 6f3e43bb77
commit 8a2435cdb1
2 changed files with 77 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -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}')
NKC_WF/site/PartMIA.aspx.cs
+76 -50
View File
@@ -12,40 +12,17 @@ namespace NKC_WF.site
{
public partial class PartMIA : BasePage
{
#region Protected Fields
/// <summary>
/// PackListID richiesta
/// Codice macchina (HARD CODED x ora)
/// </summary>
protected int PLID
{
get
{
int answ = 0;
try
{
answ = memLayer.ML.QSI("PLID");
}
catch
{ }
return answ;
}
}
/// <summary>
/// Cart richiesto
/// </summary>
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
/// <summary>
/// Bin richiesto
/// </summary>
@@ -63,28 +40,55 @@ namespace NKC_WF.site
return answ;
}
}
/// <summary>
/// Codice macchina (HARD CODED x ora)
/// Cart richiesto
/// </summary>
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)
/// <summary>
/// PackListID richiesta
/// </summary>
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
/// <summary>
/// BatchId corrente...
/// </summary>
@@ -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;
}
/// <summary>
@@ -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;
}
/// <summary>
/// Main timer
/// </summary>
@@ -178,5 +202,7 @@ namespace NKC_WF.site
// ora faccio verifiche
doUpdate();
}
#endregion Protected Methods
}
}